moro 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 27b543a627fe46b180156d8b9ab5fbcd7dc8b5d1
-  data.tar.gz: 30964a2fe875128004040983ce43f1fd4a15bf69
+  metadata.gz: 2974d4de962f4ea5717ce2d63b1bdb5fafac8edf
+  data.tar.gz: 49ca4d68746d851f02653c2fcf0b809857f565e4
 SHA512:
-  metadata.gz: 1643bf530de22a704ebbeb8cbe8312b4abb58bfe480cde00487570a04c41adc74e938308de1f239c082477a829d0b69fe2511227b7b5fc76463d54eea3bbd1c6
-  data.tar.gz: f5aa96f4f1db895053d33ffd655943fa57e89834a5e3c3f5ea0fae55c53bf9e2383491d79d641ad60ca73be751e21096bf23f66eec47b5f2edfba51ff20b2600
+  metadata.gz: 04173525eb6b45a3f9dfdca18087f3f058dc267a8940009714721c3271fe5a55ef13b7436ec9231bb509694e54a1946cb82cf876390b5b358d71aee5f97a2361
+  data.tar.gz: cfb94d1b29dd50f66f80abd72e2bef76ef65b5777a318f647be94d8214b60f0a9ac9711fa5f3c64f248abe8da2e5b56ba6dad2e84b7b70ef960c404514a3674c

data/.gitignore

@@ -1,2 +1,3 @@
 app.log
-config.json
+config.json
+*.gem

data/CHANGELOG.md

@@ -1,2 +1,5 @@
+##0.0.3
+* [pr2 handle pid change](https://github.com/sudo-recruit/moro/pull/2)
+
 ##0.0.2
 * complete basic cli

data/config.example.json

@@ -2,5 +2,6 @@
 	"processes": [{
 		"name": "unicorn",
 		"pid": "/Users/ocowchun/projects/github/jobboard/tmp/pids/server.pid"
-	}]
+	}],
+	"interval": 30
 }

data/lib/moro/cli.rb

@@ -2,9 +2,10 @@ require 'thor'
 require 'moro/version'
 require 'moro/monitor'
 require 'moro/daemon'
+require 'json'
+
 
 module Moro
-  # class << self
   class CLI< Thor
     map '--version' => :version
 
@@ -16,16 +17,34 @@ module Moro
     desc 'show', 'show process resource usage'
     option :config,:required => true,:banner=>"config.json"
     def show
-      monitor=Monitor.new(options)
+      config=get_config(options[:config])
+      monitor=Monitor.new(config)
       monitor.show
     end
 
     desc 'start', 'start monitor process resource usage'
     option :config,:required => true,:banner=>"config.json"
     def start
-      daemon=Daemon.new(options)
+      config=get_config(options[:config])
+      daemon=Daemon.new(config)
       daemon.start
     end
 
+    private
+
+    def get_config(file)
+      begin
+        data = ''
+        f = File.open(file, "r")
+        f.each_line do |line|
+          data += line
+        end
+        JSON.parse(data)
+      rescue => err
+        puts "#{err}"
+        nil
+      end
+    end
+
   end
 end

data/lib/moro/daemon.rb

@@ -3,10 +3,17 @@ require 'moro/monitor'
 module Moro
   class Daemon
 
-    def initialize(options)
-      @monitor=Monitor.new(options)
+    def initialize(config)
+      @monitor=Monitor.new(config)
       log_file="app.log"
       @logger = Logger.new log_file
+      puts config
+      
+      if config["interval"]!=nil
+        @interval=config["interval"]
+      else
+        @interval=30
+      end
     end
 
     def start()
@@ -24,7 +31,7 @@ module Moro
         @monitor.show
         @logger.info "stats memory"
 
-        sleep(10)
+        sleep(@interval)
       end
     end
   end

data/lib/moro/monitor.rb

@@ -1,15 +1,15 @@
 require "logger"
-require 'json'
 require "get_process_mem"
+require "moro/process"
 
 module Moro
   class Monitor
 
-    def initialize(options)
+    def initialize(config)
       log_file="app.log"
-      @config=options[:config]
+      @config=config
       @logger = Logger.new log_file
-      @logger.info "momo show"
+      @logger.info "moro show"
       @processes=get_processes
     end
 
@@ -25,43 +25,15 @@ module Moro
     def monit
       data=[]
       @processes.each do |p|
-        mem = GetProcessMem.new(p[:pid]).mb
-        data<<{name:p[:name],memory:mem}
+        data << p.usage
       end
       data
     end
 
-    def get_config
-      begin
-        data = ''
-        f = File.open(@config, "r")
-        f.each_line do |line|
-          data += line
-        end
-        JSON.parse(data)
-      rescue => err
-        @logger.error "Exception: #{err}"
-        puts "#{err}"
-        nil
-      end
-    end
-
-    def get_pid(filename)
-      begin
-        f = File.open(filename, "r")
-        line = f.gets
-      rescue => err
-        @logger.error "Exception: #{err}"
-        nil
-      end
-    end
-
     def get_processes()
-      config=get_config()
       processes=[]
-      config["processes"].each do|p|
-        pid=get_pid(p["pid"])
-        processes<<{name:p["name"],pid:pid} if pid!=nil
+      @config["processes"].each do|p|
+        processes<<Process.new({name:p["name"],file:p["pid"]})
       end
       processes
     end

data/lib/moro/process.rb

@@ -0,0 +1,49 @@
+require "get_process_mem"
+
+module Moro
+  class Process
+    attr_reader :name,:pid,:file
+
+    def initialize(options)
+      log_file="app.log"
+      @logger = Logger.new log_file
+      @name=options[:name]
+      @file=options[:file]
+      update_pid
+    end
+
+    def usage
+      if pid!=nil
+        pm=GetProcessMem.new(pid)
+        #pid need to change
+        if pm.bytes==0
+          update_pid
+        end
+        pm=GetProcessMem.new(pid)
+        mem = pm.mb
+        {name:name,memory:mem}
+      else
+        update_pid
+        {name:name,memory:0.0}
+      end
+    end
+
+
+    private
+
+    def get_pid(filename)
+      begin
+        f = File.open(filename, "r")
+        line = f.gets
+      rescue => err
+        @logger.error "Exception: #{err}"
+        nil
+      end
+    end
+
+    def update_pid
+      @pid=get_pid(@file)
+    end
+
+  end
+end

data/moro.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'moro'
-  s.version     = '0.0.2'
+  s.version     = '0.0.3'
   s.date        = '2016-02-24'
   s.summary     = "moro is a simple daemon to monitor process memory usage"
   s.description = "moro is a simple daemon to monitor process memory usage"

data/script/build

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+gem build moro.gemspec

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moro
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - ocowchun
@@ -50,14 +50,15 @@ files:
 - Gemfile
 - Gemfile.lock
 - README.md
-- app.rb
 - bin/moro
 - config.example.json
 - lib/moro/cli.rb
 - lib/moro/daemon.rb
 - lib/moro/monitor.rb
+- lib/moro/process.rb
 - lib/moro/version.rb
 - moro.gemspec
+- script/build
 homepage: https://github.com/sudo-recruit/moro
 licenses:
 - MIT

data/app.rb

@@ -1,58 +0,0 @@
-require "logger"
-require "get_process_mem"
-require 'json'
-
-@log_file="app.log"
-@logger = Logger.new @log_file
-
-def get_pid(filename)
-  begin
-    f = File.open(filename, "r")
-    line = f.gets
-  rescue => err
-    @logger.error "Exception: #{err}"
-    nil
-  end
-end
-
-def get_config()
-  begin
-    data = ''
-    f = File.open("config.json", "r")
-    f.each_line do |line|
-      data += line
-    end
-    JSON.parse(data)
-  rescue => err
-    @logger.error "Exception: #{err}"
-    nil
-  end
-end
-
-def get_processes()
-  config=get_config()
-  processes=[]
-  config["processes"].each do|p|
-    pid=get_pid(p["pid"])
-    processes<<{name:p["name"],pid:pid} if pid!=nil
-  end
-  processes
-end
-
-def monit_all()
-  processes=get_processes()
-  while true
-    processes.each do |p|
-      puts mem = GetProcessMem.new(p[:pid]).inspect
-    end
-    @logger.info "stats memory"
-
-    sleep(10)
-  end
-end
-
-monit_all()
-
-at_exit do
-  @logger.info "momo stop"
-end