diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb index 65dc87e..e9fb69c 100644 --- a/app/controllers/home_controller.rb +++ b/app/controllers/home_controller.rb @@ -31,8 +31,8 @@ class HomeController < ApplicationController puts "current_dir : " + @current_dir render :json => { :dir => @current_dir, - :file_manager_table => file_manager_table(@current_dir), - :disk_usage_table => disk_usage_table(@current_dir), + :file_manager_table => html_file_manager_table(@current_dir), + :disk_usage_table => html_disk_usage_table(@current_dir), :du => get_du(@current_dir), } end diff --git a/app/controllers/node_controller.rb b/app/controllers/node_controller.rb index eccb73a..462839f 100644 --- a/app/controllers/node_controller.rb +++ b/app/controllers/node_controller.rb @@ -1,7 +1,6 @@ class NodeController < ApplicationController before_action :require_login def index - @hosts = Array.new @nodes = Node.all.order("id asc") @node_connects = Array.new node_info = Hash.new @@ -32,12 +31,6 @@ class NodeController < ApplicationController end end - - if get_hosts.blank? - flash[:danger] = "Check Server" - else - @hosts = get_hosts - end rescue => ex puts ex end @@ -59,7 +52,7 @@ class NodeController < ApplicationController redirect_to '/node/index' end - def node_prove + def node_probe one_node = Node.find(params[:node_id]) puts "gluster peer probe #{one_node.host_name}" redirect_to '/node/index' diff --git a/app/controllers/volume_controller.rb b/app/controllers/volume_controller.rb index a1c13d2..703d497 100644 --- a/app/controllers/volume_controller.rb +++ b/app/controllers/volume_controller.rb @@ -10,7 +10,7 @@ class VolumeController < ApplicationController puts "current_dir : " + @current_dir render :json => { :dir => @current_dir, - :mount_table => mount_table(@current_dir), + :mount_table => html_mount_table(@current_dir), } end @@ -49,7 +49,7 @@ class VolumeController < ApplicationController #redirect_to '/volume/index' render :json => { - :volume_info => volume_info(volume_name, index), + :volume_info => html_volume_info(volume_name, index), } end @@ -61,9 +61,9 @@ class VolumeController < ApplicationController command << "sudo umount #{node.host_ip}:/#{volume_name}" puts command `#{command}` - volume = volumes.find{ |v| v['Volume Name'].delete(' ') == volume_name} + volume = ssh_volume_info.find{ |v| v['Volume Name'].delete(' ') == volume_name} render :json => { - :volume_info => volume_info(volume, 0), + :volume_info => html_volume_info(volume, 0), } end @@ -107,9 +107,9 @@ class VolumeController < ApplicationController command << "yes | sshpass -p#{node.user_password} ssh #{node.user_name}@#{node.host_ip} gluster volume stop #{volume_name}" puts command `#{command}` - volume = volumes.find{ |v| v['Volume Name'].delete(' ') == volume_name} + volume = ssh_volume_info.find{ |v| v['Volume Name'].delete(' ') == volume_name} render :json => { - :volume_info => volume_info(volume, 0), + :volume_info => html_volume_info(volume, 0), } end @@ -121,9 +121,9 @@ class VolumeController < ApplicationController command << "sshpass -p#{node.user_password} ssh #{node.user_name}@#{node.host_ip} gluster volume start #{volume_name}" puts command `#{command}` - volume = volumes.find{ |v| v['Volume Name'].delete(' ') == volume_name} + volume = ssh_volume_info.find{ |v| v['Volume Name'].delete(' ') == volume_name} render :json => { - :volume_info => volume_info(volume, 0), + :volume_info => html_volume_info(volume, 0), } end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 066c2af..e46ff7f 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -80,7 +80,7 @@ module ApplicationHelper return du end - def volumes + def ssh_volume_info volumes = Array.new volume = Hash.new node = Node.take @@ -113,6 +113,15 @@ module ApplicationHelper return volumes end + def ssh_peer_status + end + + def ssh_peer_probe + end + + def ssh_peer_detach + end + def files(dir) files = Array.new file = Hash.new diff --git a/app/helpers/home_helper.rb b/app/helpers/home_helper.rb index 858b494..bd2c53b 100644 --- a/app/helpers/home_helper.rb +++ b/app/helpers/home_helper.rb @@ -1,6 +1,6 @@ module HomeHelper - def file_manager_table(dir = @current_dir, id = "file_manager_table", class_option = "table table-striped table-bordered jambo_table") + def html_file_manager_table(dir = @current_dir, id = "file_manager_table", class_option = "table table-striped table-bordered jambo_table") html = String.new html << "