mutx 0.1.35 → 0.1.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 986d1e26216bf8f928ae1ccdc837a2664e94dc4a
-  data.tar.gz: c5b8175f0e1f68c0a9b0aa9ce424fa11861e410e
+  metadata.gz: 1fd133e11dc3c4e66e1018cd638263232925908e
+  data.tar.gz: 93205479b3beeec7fb73f2034cc16f4dfa39d458
 SHA512:
-  metadata.gz: ba36e7cf8cdda8e80ac7749941bcf04ee925df4ab6bccf1d09a754f46214f981433fc67f572737515f196c39d0df902522838f6663a4220096a4786942f54378
-  data.tar.gz: c481b7ba4b07e9b77202f182eed7c42e364c6176cee62ec519c5131b32fccf234dfaa973d1e03383f35984c2270f06d7f3ce58f52ffd9720b8192de74858df0d
+  metadata.gz: 20aa28ef149c48c25f8610d678b3558cc51b91cdadc5934b7ede7afe1f8c94b75bf84842eea8ee2faa7094d94a694cbb63fe00c4094b916ce5f681ef776f05b2
+  data.tar.gz: 474ec6dcd645a8fd2e0f9a18bf32d89734ad65fc8eda99b44e9345bd60e42d055394c6899706d30983ffccf3ede46647627b2535dc55ec2f0ad7149f304cbfa6

data/lib/generators/templates/config.ru.tt

@@ -1,2 +1,6 @@
+#!/usr/bin/env rackup
+# encoding: utf-8
 require 'mutx'
+require 'sidekiq/web'
+map('/sidekiq') { run Sidekiq::Web }
 run Cuba

data/lib/generators/templates/restart.rb.tt

@@ -2,22 +2,31 @@ require 'mutx'
 require 'byebug'
 
 module Cron
-	class Server
+  
+  class RunningTaskError < StandardError
+  end
 
-		def self.restart
-			running_task = []
-		  running_task = Mutx::Database::MongoConnector.running_now
+  class Server
+    def self.restart
+      begin
+        running_task = []
+        running_task = check
+        `mutx stop && mutx restart` if running_task.eql? []
+        raise RunningTaskError if !running_task.eql? []
+        rescue RunningTaskError
+          puts
+          puts "Tasks running right now, cant restart, trying in 10 seconds!"
+          puts
+          sleep 10
+          retry
+        end
+      Mutx::Database::MongoConnector.force_close
+    end
 
-		  if running_task.eql? []
-        Mutx::Support::Console.execute "mutx stop && mutx restart"
-      else
-      	puts
-      	puts "Tasks running right now, cant restart"
-      	puts
-      end
-		  Mutx::Database::MongoConnector.force_close
-		end
-	end#class
+    def self.check
+      Mutx::Database::MongoConnector.running_now
+    end
+  end#class
 end#module
 
 Cron::Server.restart

data/lib/mutx/background_jobs/sidekiq.rb

@@ -6,9 +6,9 @@ module Mutx
 
         workers_dir = workers_dir = __FILE__.split("/")[0..-2].join("/")+ "/workers"
 
-        Mutx::Support::Console.execute "sidekiq -r #{workers_dir}/executor.rb -d -L mutx/logs/sidekiq.log -P mutx/sidekiq_pid"
+        #Mutx::Support::Console.execute "sidekiq -r #{workers_dir}/executor.rb -d -L mutx/logs/sidekiq.log -P mutx/sidekiq_pid"
         Mutx::Support::Console.execute "sidekiq -r #{workers_dir}/mutx_cron.rb -d -L mutx/logs/sidekiq.log -P mutx/sidekiq_cron_pid"
-        Mutx::Support::Console.execute "sidekiq -r #{workers_dir}/update_started.rb -d -L mutx/logs/sidekiq.log -P mutx/sidekiq_update_started_pid"        
+        #Mutx::Support::Console.execute "sidekiq -r #{workers_dir}/update_started.rb -d -L mutx/logs/sidekiq.log -P mutx/sidekiq_update_started_pid"        
 
         print "\n* Sidekiq:"
         raise "Could not start Sidekiq correctly. Read mutx/logs/sidekiq.log file for more information" if not started?

data/lib/mutx/version.rb

@@ -1,3 +1,3 @@
 module Mutx
-  VERSION = "0.1.35"
+  VERSION = "0.1.36"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mutx
 version: !ruby/object:Gem::Version
-  version: 0.1.35
+  version: 0.1.36
 platform: ruby
 authors:
 - Roman Rodriguez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-01 00:00:00.000000000 Z
+date: 2016-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor