filecluster 0.2.6 → 0.2.7

data/README.md

@@ -46,6 +46,7 @@ Selecting available storage to copy item by policy.copy_storages (from left to t
 |daemon_global_tasks_per_thread|10|tasks count for one task thread|
 |daemon_global_tasks_threads_limit|10|tasks threads count limit for one storage|
 |daemon_copy_tasks_limit|10|copy tasks count limit for one host|
+|daemon_restart_period|86400|time between fc-daemon self restart|
 
 ## Usage
 

data/bin/fc-daemon

@@ -49,6 +49,9 @@ end
 trap("TERM") {quit_on_quit}
 trap("INT") {quit_on_quit}
 
+
+
+start_time = Time.new.to_i
 while true do
   if $exit_signal
     $log.debug('wait tasks_threads')
@@ -56,9 +59,13 @@ while true do
     if $global_daemon_thread
       $log.debug('wait global_daemon_thread')
       $global_daemon_thread.join
-    end 
+    end
     $log.info('Exit')
-    exit
+    if $exit_signal == :restart
+      exec('ruby', __FILE__)
+    else
+      exit
+    end
   else
     run_global_daemon
     update_storages
@@ -68,4 +75,9 @@ while true do
   end
   $log.debug('sleep')
   sleep FC::Var.get('daemon_cycle_time', 30).to_i
+  alive_time = Time.new.to_i - start_time
+  if !$exit_signal && alive_time > FC::Var.get('daemon_restart_period', 86400).to_i
+    $log.info("Self restart, #{alive_time} seconds up")
+    $exit_signal = :restart
+  end
 end

data/lib/daemon/task_thread.rb

@@ -21,6 +21,7 @@ class TaskThread < BaseThread
     item_storage = task[:item_storage]
     storage = $storages.detect{|s| s.name == item_storage.storage_name}
     item = FC::Item.find(item_storage.item_id)
+    $log.debug("Delete #{storage.path}#{item.name}")
     storage.delete_file(item.name)
     item_storage.delete
   rescue Exception => e

data/lib/fc/db.rb

@@ -204,6 +204,7 @@ module FC
       FC::DB.connect.query("INSERT INTO #{@prefix}vars SET name='daemon_global_tasks_per_thread', val='10', descr='tasks count for one task thread'")
       FC::DB.connect.query("INSERT INTO #{@prefix}vars SET name='daemon_global_tasks_threads_limit', val='10', descr='tasks threads count limit for one storage'")
       FC::DB.connect.query("INSERT INTO #{@prefix}vars SET name='daemon_copy_tasks_limit', val='10', descr='copy tasks count limit for one host'")
+      FC::DB.connect.query("INSERT INTO #{@prefix}vars SET name='daemon_restart_period', val='86400', descr='time between fc-daemon self restart'")
     end
   end
 end

data/lib/fc/item.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+require 'shellwords'
 
 module FC
   class Item < DbBase
@@ -15,7 +16,7 @@ module FC
         :name => item_name.to_s.gsub('//', '/').sub(/\/$/, '').sub(/^\//, '').strip,
         :policy_id => policy.id,
         :dir => File.directory?(local_path),
-        :size => `du -sb #{local_path}`.to_i
+        :size => `du -sb #{local_path.shellescape}`.to_i
       })
       item_params.delete(:replace)
       item_params.delete(:inplace)

data/lib/fc/storage.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+require 'shellwords'
 
 module FC
   class Storage < DbBase
@@ -40,15 +41,14 @@ module FC
     def copy_path(local_path, file_name)
       dst_path = "#{self.path}#{file_name}"
       
-      cmd = self.class.curr_host == host ? 
-        "mkdir -p #{File.dirname(dst_path)}" : 
-        "ssh -oBatchMode=yes -oStrictHostKeyChecking=no #{self.host} 'mkdir -p #{File.dirname(dst_path)}'"
+      cmd = "rm -rf #{dst_path.shellescape}; mkdir -p #{File.dirname(dst_path).shellescape}"
+      cmd = self.class.curr_host == host ? cmd : "ssh -oBatchMode=yes -oStrictHostKeyChecking=no #{self.host} '#{cmd}'"
       r = `#{cmd} 2>&1`
       raise r if $?.exitstatus != 0
       
       cmd = self.class.curr_host == host ? 
-        "cp -r #{local_path} #{dst_path}" : 
-        "scp -rB #{local_path} #{self.host}:#{dst_path}"
+        "cp -r #{local_path.shellescape} #{dst_path}" : 
+        "scp -rB #{local_path.shellescape} #{self.host}:#{dst_path.shellescape}"
       r = `#{cmd} 2>&1`
       raise r if $?.exitstatus != 0
     end
@@ -57,12 +57,12 @@ module FC
     def copy_to_local(file_name, local_path)
       src_path = "#{self.path}#{file_name}"
       
-      r = `mkdir -p #{File.dirname(local_path)} 2>&1`
+      r = `rm -rf #{local_path.shellescape}; mkdir -p #{File.dirname(local_path).shellescape} 2>&1`
       raise r if $?.exitstatus != 0
       
       cmd = self.class.curr_host == host ? 
-        "cp -r #{src_path} #{local_path}" : 
-        "scp -rB #{self.host}:#{src_path} #{local_path}"
+        "cp -r #{src_path.shellescape} #{local_path.shellescape}" : 
+        "scp -rB #{self.host}:#{src_path.shellescape} #{local_path.shellescape}"
       r = `#{cmd} 2>&1`
       raise r if $?.exitstatus != 0
     end
@@ -71,14 +71,14 @@ module FC
     def delete_file(file_name)
       dst_path = "#{self.path}#{file_name}"
       cmd = self.class.curr_host == host ? 
-        "rm -rf #{dst_path}" : 
-        "ssh -oBatchMode=yes -oStrictHostKeyChecking=no #{self.host} 'rm -rf #{dst_path}'"
+        "rm -rf #{dst_path.shellescape}" : 
+        "ssh -oBatchMode=yes -oStrictHostKeyChecking=no #{self.host} 'rm -rf #{dst_path.shellescape}'"
       r = `#{cmd} 2>&1`
       raise r if $?.exitstatus != 0
       
       cmd = self.class.curr_host == host ? 
-        "ls -la #{dst_path}" : 
-        "ssh -oBatchMode=yes -oStrictHostKeyChecking=no #{self.host} 'ls -la #{dst_path}'"
+        "ls -la #{dst_path.shellescape}" : 
+        "ssh -oBatchMode=yes -oStrictHostKeyChecking=no #{self.host} 'ls -la #{dst_path.shellescape}'"
       r = `#{cmd} 2>/dev/null`
       raise "Path #{dst_path} not deleted" unless r.empty?
     end
@@ -88,8 +88,8 @@ module FC
       dst_path = "#{self.path}#{file_name}"
       
       cmd = self.class.curr_host == host ? 
-        "du -sb #{dst_path}" : 
-        "ssh -oBatchMode=yes -oStrictHostKeyChecking=no #{self.host} 'du -sb #{dst_path}'"
+        "du -sb #{dst_path.shellescape}" : 
+        "ssh -oBatchMode=yes -oStrictHostKeyChecking=no #{self.host} 'du -sb #{dst_path.shellescape}'"
       r = ignore_errors ? `#{cmd} 2>/dev/null` : `#{cmd} 2>&1`
       raise r if $?.exitstatus != 0
       r.to_i

data/lib/fc/version.rb

@@ -1,3 +1,3 @@
 module FC
-  VERSION = "0.2.6"
+  VERSION = "0.2.7"
 end

data/lib/manage/storages.rb

@@ -1,3 +1,6 @@
+# encoding: utf-8
+require 'shellwords'
+
 def storages_list
   storages = FC::Storage.where("1 ORDER BY host")
   if storages.size == 0
@@ -230,7 +233,7 @@ def make_storages_sync(storage, make_delete, silent = false)
   puts "Deleted #{count} items_storages" unless silent
   
   # delete empty folders
-  count = `find #{storage.path} -empty -type d`.split("\n").count
-  `find #{storage.path} -empty -type d -delete` if make_delete
+  count = `find #{storage.path.shellescape} -empty -type d`.split("\n").count
+  `find #{storage.path.shellescape} -empty -type d -delete` if make_delete
   puts "Deleted #{count} empty folders" unless silent
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: filecluster
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-22 00:00:00.000000000 Z
+date: 2013-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rb-readline
@@ -192,7 +192,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3411895741076242860
+      hash: 2992741008983549077
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -201,7 +201,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3411895741076242860
+      hash: 2992741008983549077
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24