mutx 0.1.16 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2dfe4f2fc2a3e4483eed44f8f91cf7d594cfa159
-  data.tar.gz: 8851b5805e2d265f9122a6d0ee8097db28fce6fb
+  metadata.gz: 8be5dba99d94b6af03b1d5d8c2beb96e3ab997cf
+  data.tar.gz: 1edc577db14cb4e968ae1f678fc7cb824bb574fe
 SHA512:
-  metadata.gz: 90e2586de24dbf381ab1886b9970b4e4f446c6341e5a7f08096cc1d17ddc9e75fc9a8f04bbce3b7d350a69e3d54ac7a71e965bdaa7dd34580ee6e4a504d1d44a
-  data.tar.gz: be8292794e05d09019d7bbf98ae6316646905b761f61a5f7689b61be79f050c91d28a165e9eab62011eae1e65e8301a93d83013904456f546b97b7c70f28c1bb
+  metadata.gz: 0a0e248b5d40d2089a33337be0d8857a42fec91172f43534e499973ae7d302b14708a6fe261aa7a917b2d3a8e823d86a329f3b68aabea0ac9a57807139b70d15
+  data.tar.gz: c82b259b5f14667755e837419102ea1f6077e0c9265e2d52b91b1246ab28421b59b616600b7443213372c1370a00725774a70186ac6615cde11fbdd7d4a706df

data/lib/mutx/API/execution.rb

@@ -49,8 +49,6 @@ module Mutx
 
             task.push_exec execution_id
 
-            task.set_running!
-
             task.save!
 
             Mutx::Support::Log.debug "Task #{task_name} setted as running" if Mutx::Support::Log
@@ -111,7 +109,6 @@ module Mutx
               if result.pid
                 Mutx::Support::Processes.kill_p(result.pid)
                 killed = true
-                task.set_ready!
                 Mutx::Support::Log.debug "Execution (id=#{result.id}) killed"
               end
             rescue => e
@@ -131,7 +128,6 @@ module Mutx
             result.show_as = "pending"
             result.save!
 
-            # task.set_ready! if Mutx::Results.is_there_running_executions_for? task.name
             if killed 
               message = "Execution: Stopped (forced) "
               message += " Files: Cleanned" if cleanned

data/lib/mutx/background_jobs/workers/email_sender.rb

@@ -50,9 +50,7 @@ module Mutx
 
         mail.add_file "result.html"
 
-        html_part.body "\nA continuacion se adjunta el resutado de la ejecucion solicitada"
-        html_part.body ""
-        html_part.body "\n-.Equipo [MuTX].-"
+        html_part.body "\nA continuacion se adjunta el resutado de la ejecucion solicitada. -.Equipo [MuTX].-"
 
         puts "ENVIANDO RESULTADO VIA MAIL"
 

data/lib/mutx/commands/start.rb

@@ -65,11 +65,6 @@ module Mutx
         Mutx::Support::FilesCleanner.clear_sidekiq_log
         Mutx::Support::Log.debug "Sidekiq log file cleanned" if Mutx::Support::Log
 
-        # To prevent showing tasks as runnnig when service started recently reset all tasks
-        Mutx::Support::Log.debug "Reseting tasks statuses" if Mutx::Support::Log
-        Mutx::Tasks.reset!
-        Mutx::Support::Log.debug "Tasks statuses reseted" if Mutx::Support::Log
-        puts "\n* Tasks Status: Reseted"
 
         # Force results to reset or finished status
         Mutx::Support::Log.debug "Reseting defunct executions" if Mutx::Support::Log

data/lib/mutx/database/mongo_connector.rb

@@ -142,18 +142,6 @@ module Mutx
         ["tasks","results","custom_params","commit","configuration"]
       end
 
-      # Drops all mutx collections
-      # def self.drop_collections hard=false
-      #   db = self.mutx_db
-      #   collections_to_drop = collections
-      #   unless hard
-      #     ["custom_params","tasks"].each{|col| collections_to_drop.delete(col)}
-      #   end
-      #   collections_to_drop.each do |collection|
-      #     db.drop_collection(collection) if collection != "documentation"
-      #   end
-      # end
-
       def self.drop_collections hard=false
         collections_to_drop = self.collections
         ["custom_params","tasks"].each{|col| collections_to_drop.delete(col)} unless hard
@@ -162,10 +150,7 @@ module Mutx
         end
       end
 
-      # def self.mutx_db
-      #   MongoClient.new().db(@@db_name)
-      # end
-
+    
 
       ##################################
       # COMMITS
@@ -271,12 +256,14 @@ module Mutx
 
       def self.running type
         Mutx::Support::Log.debug "Getting db running tasks" if Mutx::Support::Log
-        @@tasks.find({"status" => "RUNNING", "type" => type}).to_a
+        @@results.find({"status" => /started|running/, "task.type" => type}).to_a.map do |result|
+          self.task_data_for result["task"]["id"]
+        end.uniq
       end
 
       def self.running_for_task task_name
         Mutx::Support::Log.debug "Getting db running for task name #{task_name}" if Mutx::Support::Log
-        @@tasks.find({"name" => task_name, "status" => "RUNNING"}).to_a
+        @@results.find({"status" => /started|running/, "task.name" => task_name}).to_a
       end
 
       def self.active_tasks

data/lib/mutx/results/result.rb

@@ -451,7 +451,7 @@ module Mutx
       end
 
       def is_running?
-        @status =~ /running|stated/i
+        @status =~ /running|started/i
       end
 
 

data/lib/mutx/support/clean.rb

@@ -3,7 +3,6 @@ module Mutx
   module Support
     module Clean
       def self.start
-        Mutx::Tasks.reset!
         Mutx::Results.reset!
         Mutx::Support::FilesCleanner.delete_all_mutx_reports
         Mutx::Support::FilesCleanner.delete_all_console_output_files

data/lib/mutx/tasks/tasks.rb

@@ -111,13 +111,11 @@ module Mutx
     # Returns the ids for running tasks
     # @return [Array] of task ids
     def self.running_tasks
-      # Obtener el listado completo de tasks y luego filtrar las que tienen results running
-      # Mutx::Database::MongoConnector.running_tasks
+      Mutx::Database::MongoConnector.running_tasks
     end
 
     def self.running_tests
-      # Obtener el listado completo de tasks y luego filtrar las que tienen results running
-      # Mutx::Database::MongoConnector.running_tests
+      Mutx::Database::MongoConnector.running_tests
     end
 
     def self.exist_task? task_id
@@ -148,13 +146,5 @@ module Mutx
       {success:success, message:message}
     end
 
-    # Resets all Tasks
-    def self.reset!
-      Mutx::Support::Log.debug "Resetting tasks status" if Mutx::Support::Log
-      self.running_tasks.each do |task|
-        Mutx::Tasks::Task.get(task["_id"]).set_ready!
-      end
-    end
-
   end
 end

data/lib/mutx/version.rb

@@ -1,3 +1,3 @@
 module Mutx
-  VERSION = "0.1.16"
+  VERSION = "0.1.17"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mutx
 version: !ruby/object:Gem::Version
-  version: 0.1.16
+  version: 0.1.17
 platform: ruby
 authors:
 - Roman Rodriguez