simple_apm 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd4fe5594ac36d455b7fdf4ca4a4fc651ad14548b90ff012ee6d751a6c2beb7f
-  data.tar.gz: 8df2b6f4ee913baa062951348eb3cdf6cc857f7e0c94908d643ddb975c947105
+  metadata.gz: fef3d86f5fe835b90243b01bc335aabbc20bbfd1d581eab08e71b851790be92a
+  data.tar.gz: 353ee2dab5eba98f1e3bbbb4bcc5c01f17bd0a049484c5dcc9c5aece426c83dc
 SHA512:
-  metadata.gz: c21c50c8ba0febe13256b1ff7df86429f9524ca9c9c66edf0c8fa421ab51f049e393350dad832588ddbe671e3d0565f4c785df4e8121a44443b440ea7da3cf88
-  data.tar.gz: 6757487076b662d638be97459e8784fd5759a56e4200ad321bc292c3e15d15b3801894ca44b90ee78c18b531337820747326df20f11ca7ebedf1dc339fb3f8ea
+  metadata.gz: 3a5110cfae48bf65c15cbe89ed8906c67d6ca3452f1a97ebf567b72087555626dac2d8c4d643fcdb4be4c22e44ad63e357378258f9efe98a1ed1f6c4931ada36
+  data.tar.gz: 8b6b5ac0420c57abb6e557dd1fb02690e4f4f947445fe76ad9e903df6da0b0694e09e9547e4594a8b8c0010372ec8eea84c0043f71710cda3dd54b73f0470fa1

data/app/controllers/simple_apm/apm_controller.rb

@@ -65,6 +65,12 @@ module SimpleApm
       elsif params[:type]=='week'
         del_count = SimpleApm::Redis.clear_data_before_time(Time.now.at_beginning_of_day - 1.week)
         flash[:notice] = "成功删除#{del_count}条数据"
+      elsif params[:type]=='stop_data'
+        SimpleApm::Redis.stop!
+        flash[:notice] = '设置成功！'
+      elsif params[:type]=='rerun_data'
+        SimpleApm::Redis.rerun!
+        flash[:notice] = '设置成功！'
       else
         flash[:notice] = '未知操作！'
         # r = params[:date].map{|d|SimpleApm::Redis.clear_data(d)}

data/app/views/layouts/simple_apm/application.html.erb

@@ -113,6 +113,13 @@
   <% SimpleApm::Redis.simple_info.each do |k, v| %>
     <label><%= k %>：</label><span><%= v %></span>
   <% end %>
+  <p>
+    <% if SimpleApm::Redis.running? %>
+      <span style="color: greenyellow">数据收集中……</span>
+    <% else %>
+      <span style="color: red">已暂停</span>
+    <% end %>
+  </p>
 </footer>
 <div id="sql-modal" class="modal" aria-hidden="true" role="dialog" style="display: none;" tabindex="-1">
   <div class="modal-dialog modal-lg modal-dialog-popout">

data/app/views/simple_apm/apm/data.html.erb

@@ -1,7 +1,13 @@
+<% if SimpleApm::Redis.running? %>
+  <%= link_to '暂停收集数据', data_delete_path(type: 'stop_data'), class: 'btn btn-warning btn-sm', 'data-confirm'=>'确定暂停吗？' %>
+<% else %>
+  <%= link_to '继续收集数据', data_delete_path(type: 'rerun_data'), class: 'btn btn-primary btn-sm' %>
+<% end %>
+<%= link_to '', data_delete_path(type: ''), class: 'btn' %>
 <p class="pull-right">
   <span class="text-danger">删除数据：</span>
-  <%= link_to '保留进一周数据', data_delete_path(type: 'week'), class: 'btn btn-danger', 'data-confirm'=> '确定删除所有一周以前的数据？'%>
-  <%= link_to '保留进一个月数据', data_delete_path(type: 'month'), class: 'btn btn-danger', 'data-confirm'=> '确定删除所有一个月以前的数据？' %>
+  <%= link_to '保留进一周数据', data_delete_path(type: 'week'), class: 'btn btn-danger', 'data-confirm' => '确定删除所有一周以前的数据？' %>
+  <%= link_to '保留进一个月数据', data_delete_path(type: 'month'), class: 'btn btn-danger', 'data-confirm' => '确定删除所有一个月以前的数据？' %>
 </p>
 
 <table class="table table-bordered">
@@ -17,10 +23,10 @@
   <!--  {day: date_str, hits: hits, time: time, avg_time: avg_time}-->
   <% @data.each do |d| %>
     <tr>
-      <td><%= d[:day]%></td>
-      <td><%= d[:hits]%></td>
-      <td><%= sec_str d[:avg_time]%></td>
-      <td><%= link_to '删除', data_delete_path(date: d[:day]), 'data-confirm'=> '确定删除？' %></td>
+      <td><%= d[:day] %></td>
+      <td><%= d[:hits] %></td>
+      <td><%= sec_str d[:avg_time] %></td>
+      <td><%= link_to '删除', data_delete_path(date: d[:day]), 'data-confirm' => '确定删除？' %></td>
     </tr>
   <% end %>
   </tbody>

data/lib/simple_apm.rb

@@ -7,6 +7,7 @@ module SimpleApm
     begin
       request_id = Thread.current['action_dispatch.request_id']
       need_skip = payload[:controller] == 'SimpleApm::ApmController'
+      need_skip = true if payload[:status].to_s=='302' && payload[:path].to_s=~/login/ && payload[:method].to_s.downcase=='get'
       if request_id.present?
         if need_skip
           SimpleApm::Sql.delete_by_request_id(request_id)

data/lib/simple_apm/engine.rb

@@ -5,7 +5,9 @@ module SimpleApm
     end
 
     def call(env)
-      Thread.current['action_dispatch.request_id'] = env['action_dispatch.request_id']
+      if SimpleApm::Redis.running?
+        Thread.current['action_dispatch.request_id'] = env['action_dispatch.request_id']
+      end
       @app.call(env)
     end
   end

data/lib/simple_apm/redis.rb

@@ -55,6 +55,19 @@ module SimpleApm
         {success: true, msg: SimpleApm::Redis.del(keys)}
       end
 
+      def running?
+        hget('status','running').to_s != 'false'
+      end
+      
+      def rerun!
+        hset('status', 'running', true)
+      end
+
+      # 停止收集数据
+      def stop!
+        hset('status', 'running', false)
+      end
+
       def method_missing(method, *args)
         instance.send(method, *args)
       rescue NoMethodError

data/lib/simple_apm/version.rb

@@ -1,3 +1,3 @@
 module SimpleApm
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_apm
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - yuanyin.xia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-05 00:00:00.000000000 Z
+date: 2018-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -28,28 +28,28 @@ dependencies:
   name: redis-namespace
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: callsite
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.0'
 description: 'xyy: Simple Apm View for rails using redis.'