diff --git a/app/controllers/volume_controller.rb b/app/controllers/volume_controller.rb index bc8c797..46adb2f 100644 --- a/app/controllers/volume_controller.rb +++ b/app/controllers/volume_controller.rb @@ -3,9 +3,8 @@ class VolumeController < ApplicationController def index file_directory("/mnt") get_conf - info = get_info.split("\n") - - if info.blank? + info = get_volume_info.split("\n") + if info.blank? flash[:danger] = "Check Server" else parse_info(info) @@ -16,34 +15,26 @@ class VolumeController < ApplicationController @volumes = Array.new volume = Hash.new df = get_df - + info << "\n" info.each do |t| next if t.equal? info.first - if t.include? ":" temp = t.split(":") volume[temp[0]] = temp[1] else - if df.include? volume['Volume Name'].delete(' ') - volume['Mount State'] = "Mounted" - else - volume['Mount State'] = "UnMounted" - end - puts volume['Volume Name'] + ": " + volume['Mount State'] - + String state = (df.include? volume['Volume Name'].delete(' ')) ? "Mounted" : "UnMounted" + volume['Mount State'] = state @volumes << volume volume = Hash.new end end - @volumes << volume - end def get_df return `df -P` end - def get_info + def get_volume_info return `sshpass -p#{@config["host_password"]} ssh #{@config["host_port"]} #{@config["host_user"]}@#{@config["host_ip"]} gluster volume info` end @@ -69,7 +60,7 @@ class VolumeController < ApplicationController volume_name = params[:volume_name] volume_name = volume_name.delete(' ') puts "gluster volume stop " + volume_name - output = `yes | sshpass -p#{@config["host_password"]} ssh #{@config["host_port"]} #{@config["host_user"]}@#{@config["host_ip"]} gluster volume stop #{volume_name}` + `yes | sshpass -p#{@config["host_password"]} ssh #{@config["host_port"]} #{@config["host_user"]}@#{@config["host_ip"]} gluster volume stop #{volume_name}` redirect_to '/volume/index' end @@ -78,7 +69,7 @@ class VolumeController < ApplicationController volume_name = params[:volume_name] volume_name = volume_name.delete(' ') puts "gluster volume start " + volume_name - output = `sshpass -p#{@config["host_password"]} ssh #{@config["host_port"]} #{@config["host_user"]}@#{@config["host_ip"]} gluster volume start #{volume_name}` + `sshpass -p#{@config["host_password"]} ssh #{@config["host_port"]} #{@config["host_user"]}@#{@config["host_ip"]} gluster volume start #{volume_name}` redirect_to '/volume/index' end @@ -88,7 +79,7 @@ class VolumeController < ApplicationController volume_name = params[:volume_name] volume_name = volume_name.delete(' ') puts "gluster volume delete " + volume_name - output = `yes | sshpass -p#{@config["host_password"]} ssh #{@config["host_port"]} #{@config["host_user"]}@#{@config["host_ip"]} gluster volume delete #{volume_name}` + `yes | sshpass -p#{@config["host_password"]} ssh #{@config["host_port"]} #{@config["host_user"]}@#{@config["host_ip"]} gluster volume delete #{volume_name}` redirect_to '/volume/index' end end diff --git a/app/views/volume/index.html.erb b/app/views/volume/index.html.erb index cace3b4..f320717 100644 --- a/app/views/volume/index.html.erb +++ b/app/views/volume/index.html.erb @@ -116,7 +116,7 @@
Volume Info
Drag multiple files to the box below for multi upload or click to select files.