mutx 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cdd1c0a2fb4f63c702cbe7b48a1af13eaeb1701e
-  data.tar.gz: 85182685d9d2e7d09d1d630f8bf9a42ffc33c52a
+  metadata.gz: 992bc0922cc0f464cf77fd63fbe1af49d8494fbf
+  data.tar.gz: 55e51b7b64e813f571579e1442304844b766f926
 SHA512:
-  metadata.gz: b1a2ca775eea60c56bfd60cf78e03d912ffcc6cef40fb7f967102abe3b28a31be374c4bb573c9d5c43697af5d9c0d05c0c1593e0b6445b331a676d6ed5a9cba8
-  data.tar.gz: 1de9e41d68850a10d6b1cb4a2b0d596cacc8e6e9ec67d6a30f825e2b5282b6372b62451b861eddb30085654c5cd60f6f403ffab5b32ec953c95449ac52bd1111
+  metadata.gz: cbfd95ff0feea70db207711e9c9806b7f1f57f91f8c8c0a252b4e2fa1ec4354e74cfdfbe1a0602f2bd87958952b945bd3b4de3118d6a49ee995b3565ca004b06
+  data.tar.gz: 53f56bff5a5f3db0e725b9b3bb7466388118e478199eaa5b822b2c3c152b314124bfd52b5619a000a6ea6a6ca8eb642b5a541d29d82be3250732738e85b1a9a0

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

@@ -18,15 +18,17 @@ module Mutx
               stdout.each do |line|
                 stringio.puts line
               end
-            rescue Errno::EIO
+            rescue Errno::EIO => e
+              stringio.puts e.message
+              stringio.puts e.backtrace
             ensure
               Process.wait pid
               status = $?.exitstatus
             end
-          end 
+          end
         rescue => e
-          logger.debug(e.message)
-          logger.debug(e.backtrace)
+          stringio.puts e.message
+          stringio.puts e.backtrace
           raise e
         ensure
           @alert.update_status(status, info: stringio.string)

data/lib/mutx/lib/paths.rb

@@ -18,7 +18,7 @@ module Mutx
       admin_tasks_delete: '/admin/tasks/:task_id/delete',
       admin_tasks_create: '/admin/tasks',
       admin_tasks_update: '/admin/tasks/:task_id',
-      admin_tasks_destroy: '/admin/tasks/task_id/delete',
+      admin_tasks_destroy: '/admin/tasks/:task_id/delete',
 
       admin_custom_params_index: '/admin/custom-params',
       admin_custom_params_new: '/admin/custom-params/new',
@@ -60,6 +60,7 @@ module Mutx
       alerts_show: '/alerts/:alert_name',
       alerts_on: '/alerts/:alert_name/run',
       alerts_off: '/alerts/:alert_name/stop',
+      alerts_clear: '/alerts/:alert_name/clear',
 
       features_index: '/features',
       features_file: '/features/file',

data/lib/mutx/models/alert.rb

@@ -115,9 +115,9 @@ module Mutx
 
     def update_status(a_new_status, info: nil)
       last_result = self.result
-      return if ((last_result.to_s == a_new_status.to_s) or (a_new_result.to_i == STATUS[:skip]))
+      return if ((last_result.to_s == a_new_status.to_s) or (a_new_status.to_i == STATUS[:skip]))
       self.result = a_new_status
-      notify(info) if last_result
+      notify(info) if last_result || a_new_status.to_i == STATUS[:unknown]
     end
 
     def result
@@ -132,6 +132,12 @@ module Mutx
       end
     end
 
+    def clear
+      Sidekiq.redis do |redis|
+        redis.del("alerts:#{name}")
+      end
+    end
+
     private
     def extract_info
       content = File.read(File.join(ALERT_FOLDER, filename))

data/lib/mutx/routes.rb

@@ -48,13 +48,15 @@ module Mutx
         on('message') { run Mutx::Routes::Message::Routes }
         on('help') { run Mutx::Routes::Help::Routes }
 
-        on get do
+        on post do
           on "pull" do
             #Check for updates on the branch and make a pull if its outdated
             Mutx::Support::Git.pull unless Mutx::Support::Git.up_to_date?
             res.redirect "/tasks"
           end
+        end
 
+        on get do
           on "logout" do
             $result = nil
             $result = false

data/lib/mutx/routes/alerts_routes.rb

@@ -32,6 +32,13 @@ module Mutx
               flash[:info] = "Alert off success"
               res.redirect path_for(:alerts_index) 
             end
+
+            on ':alert_name/clear' do |alert_name|
+              alert = Alert.find(name: alert_name)
+              alert.clear
+              flash[:info] = "Alert clear success"
+              res.redirect path_for(:alerts_index) 
+            end
           end
         end
       end

data/lib/mutx/version.rb

@@ -1,3 +1,3 @@
 module Mutx
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

data/lib/mutx/view/admin/tasks/_delete_form.mote

@@ -73,7 +73,7 @@
         <center>
 
           <input type="submit" class="btn btn-success" value="Delete">&nbsp;
-          <a class="btn btn-danger" href="/admin/tasks/list">Cancel</a>
+          <a class="btn btn-danger" href="{{ path_for(:admin_tasks_index) }}">Cancel</a>
           </center>
         </div>
       </td>

data/lib/mutx/view/alerts/_alert.mote

@@ -17,11 +17,13 @@
 
   <td>
     {{ alert.last_enqueue.strftime("at %I:%M%p") if alert.last_enqueue }}
+    <form name="{{ alert.name }}" method="POST" action="{{ path_for(:alerts_clear, alert_name: alert.name)}}" >
+      <button type="submit">Clear</button>
+    </form>
   </td>
 
   <td>
-    <span class="label label-{{ { success: 'success', warning: 'warning', critical: 'danger', unknown: 'primary' }[alert.status] }}"> {{ alert.status }} </span>
-    
+    <span class="label label-{{ { ok: 'success', warning: 'warning', critical: 'danger', unknown: 'primary' }[alert.status] }}"> {{ alert.status.upcase }} </span> 
   </td>
 
   <td>
@@ -35,8 +37,15 @@
     <span class="label label-danger"> Stopped </span>
   </td>
 
-  <td/>
-  <td/>
+  <td>
+    {{ alert.last_enqueue.strftime("at %I:%M%p") if alert.last_enqueue }}
+    <form name="{{ alert.name }}" method="POST" action="{{ path_for(:alerts_clear, alert_name: alert.name)}}" >
+      <button type="submit">Clear</button>
+    </form>
+  </td>
+  <td>
+    <span class="label label-{{ { ok: 'success', warning: 'warning', critical: 'danger', unknown: 'primary' }[alert.status] }}"> {{ alert.status.upcase }} </span> 
+  </td>
   <td>
     <form name="{{ alert.name }}" method="POST" action="{{ path_for(:alerts_on, alert_name: alert.name)}}" >
       <button type="submit">{{ Mutx::View.icon_for("on") }}</button>

metadata

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