qnotifier 0.7.2 → 0.7.3

data/Manifest

@@ -4,10 +4,9 @@ bin/qnotifier
 config/qnotifier_config.yml
 config/README
 gem-public_cert.pem
-lib/command.rb
 lib/plugin.rb
 lib/qnotifier.rb
-lib/qnotifierd.rb
+lib/qnotifier_runner.rb
 lib/storage.rb
 lib/web_service.rb
 plugins/apache.rb

data/bin/qnotifier

@@ -1,5 +1,217 @@
 #!/usr/bin/env ruby
 $LOAD_PATH.unshift( File.join( File.dirname(__FILE__), '../lib' ) )
-require "command"
-Qnotifier::Command.run(ARGV)
+require 'fileutils'
 
+module Qnotifier
+  class Command
+        
+    def self.run(argv)
+            
+      unless Process.euid == 0
+        puts "QNotifier should be only started by root (the daemon will drop privs)"
+        exit
+      end
+      
+      if has_api_key?
+        if argv.first == 'stop'
+          stop
+          
+        elsif argv.first == 'start'
+          start
+          
+        elsif argv.first == 'restart'
+          stop
+          start
+          
+        elsif argv.first == 'zap'
+          zap
+          
+        elsif argv.first == 'reset'
+          print "\nWould you like to reset the state of the saved variables? (y/n):"
+          response = STDIN.gets.chomp.downcase!
+          if response == "y" || response == "yes"
+            `rm /var/lib/qnotifier/saved_variables.yml`
+          end
+          
+        elsif argv.first == 'register'  
+          require "qnotifier"
+          qnotifier = Qnotifier::MainProcess.new
+          qnotifier.wipe
+          setup_registration
+          
+        elsif argv.first == 'debug'
+          puts "Running once in debug mode (use this mode to debug your plugins)\n\n"
+          require "qnotifier"
+          qnotifier = Qnotifier::MainProcess.new
+          $qnotifier_debug = true
+          qnotifier.run
+          
+        elsif argv.first == 'setup-directories'
+          setup_directories
+          
+        else
+          puts "usage: qnotifier start | stop | restart | zap | reset | register | debug"
+          puts "see http://qnotifier.com for more details"
+        end
+
+      else
+        puts "No API Key Found"
+        setup_directories
+        setup_registration
+      end
+    end
+        
+    def self.has_api_key?
+      api_key = nil
+      begin
+        api_key_file = File.open("/var/lib/qnotifier/api_key")
+        while (line = api_key_file.readline)
+          api_key = line
+        end
+      rescue EOFError 
+      rescue Exception => e
+      end
+      if api_key
+        return true 
+      else 
+        if File.exists?("/var/lib/qnotifier/api_key")
+          puts "API Key file exists but cannot read API Key, exiting"
+          exit
+        end
+        return false
+      end
+    end
+    
+    def self.setup_directories
+      puts "Setting Up Directories"
+      var_dir = "/var/lib/qnotifier"
+      unless File.exists?(var_dir)
+        begin
+          puts "Creating #{var_dir}"
+          FileUtils.mkdir_p var_dir
+          FileUtils.mkdir_p "#{var_dir}/plugins"
+          default_config_file = File.dirname(__FILE__) + "/../config/qnotifier_config.yml"
+          `cp #{default_config_file} #{var_dir}/qnotifier_config.yml`
+          readme_file = File.dirname(__FILE__) + "/../config/README"
+          `cp #{readme_file} #{var_dir}/plugins/README`
+        rescue Exception => e
+          puts "Can't setup the var directory: #{e}"
+          puts "Exiting"
+          exit
+        end
+      end
+    end
+  
+    def self.setup_registration
+      puts "Starting QNotifier Agent Setup\n\n"
+      puts "In order to use this agent you must enter the six number Registration Code that was presented to you when the server was created in the QNotifier system (in the iPhone/iPad/Website).\n\n"
+      print "Registration Code: "
+      register_code = STDIN.gets.chomp
+      
+      if register_code and register_code.size == 6
+        require "qnotifier"
+        qnotifier = Qnotifier::MainProcess.new
+        if qnotifier.register(register_code) 
+          puts "\nOK, the server has been successfully registered."
+          puts "You now can control the agent as a daemon using 'qnotifier start|stop|restart'"
+          copy_init
+          puts "Doing initial update..."
+          qnotifier.run
+          puts "\nPlease start the qnotifier daemon now ('sudo qnotifier start')"
+        else
+          puts "Exiting."
+        end
+      else
+        puts "\nInvalid code, please enter a six number Registration Code to use this agent.\n"
+        exit
+      end
+    end
+    
+    def self.copy_init
+      print "\nWould you like to install the qnotifier init script in /etc/init.d? (y/n):"
+      response = STDIN.gets.chomp.downcase!
+      if response == "y" || response == "yes"
+        init_file = File.dirname(__FILE__) + "/../init/qnotifier"
+        `cp #{init_file} /etc/init.d/`
+      end
+    end
+    
+    def self.running
+      pid_file = "/var/lib/qnotifier/qnotifer.pid"
+      if File.exists?(pid_file)
+        begin
+          pid = `cat #{pid_file}`.to_i
+          Process.getpgid(pid)
+          return true
+        rescue
+          `rm #{pid_file}`
+          return false
+        end
+      else
+        return false
+      end
+    end
+  
+    def self.zap
+      pid_file = "/var/lib/qnotifier/qnotifer.pid"
+      if File.exists?(pid_file)
+        `rm #{pid_file}`
+      end
+      runlock_file = "/var/lib/qnotifier/.runlock"
+      if File.exists?(runlock_file)
+        `rm #{runlock_file}`
+      end
+    end
+  
+    def self.start
+      puts "Starting QNotifier..."
+      
+      runlock_file = "/var/lib/qnotifier/.runlock"
+      if File.exists?(runlock_file)
+        `rm #{runlock_file}`
+      end
+      
+      pid_file = "/var/lib/qnotifier/qnotifer.pid"
+      if running
+        puts "Daemon is already running, check pid #{pid_file}"
+        exit
+      end
+      
+      pid = fork do
+        `echo #{Process.pid} > /var/lib/qnotifier/qnotifer.pid`
+        $0 = 'qnotifierd'
+        Process.setsid
+        #Process.euid = 65534
+        exit if fork
+        File.umask 0000
+        STDIN.reopen "/dev/null"
+        STDOUT.reopen "/dev/null", "a"
+        STDERR.reopen STDOUT
+        trap("TERM") {daemon.stop; exit}
+        loop do
+          cpid = fork do
+            require "qnotifier"
+            $0 = 'qnotifier-runner'
+            qnotifier = Qnotifier::MainProcess.new
+            qnotifier.run
+          end
+          Process.detach cpid
+          sleep 30
+        end
+      end      
+      Process.detach pid
+    end
+    
+    def self.stop
+      puts "Stopping QNotifier..."
+      pid_file = "/var/lib/qnotifier/qnotifer.pid"
+      if running
+        pid = `cat #{pid_file}`.to_i
+        Process.kill "TERM", pid
+        `rm /var/lib/qnotifier/qnotifer.pid`
+      end
+    end
+  end
+end
+
+Qnotifier::Command.run(ARGV)

data/lib/qnotifier.rb

@@ -44,7 +44,9 @@ module Qnotifier
       end
     end
     
-    def run
+    def run      
+      Qnotifier.log.info "QNotifier Running"
+      
       runlock_file = "/var/lib/qnotifier/.runlock"
       if File.exists?(runlock_file)
         puts "Runlock exists at #{runlock_file} - process already running? Exiting."
@@ -192,7 +194,3 @@ module Qnotifier
     end
   end
 end
-
-# The main part of the script
-qnotifier = Qnotifier::MainProcess.new
-qnotifier.run

data/lib/web_service.rb

@@ -10,7 +10,7 @@ module Qnotifier
     attr_accessor :config
     
     def initialize
-      
+      @@poll_interval = 300
       RestClient.proxy = ENV['http_proxy']
     end
         
@@ -78,7 +78,10 @@ module Qnotifier
         puts "\nNot sending data to server due to debug mode."
         return
       end
-      return if last_run and (Time.now - last_run) <= 300
+      if last_run and (Time.now - last_run) <= @@poll_interval
+        Qnotifier.log.info "Not running yet, waiting until #{last_run + @@poll_interval}"
+        return
+      end
       Qnotifier::Storage.put("last_run", Time.now)
 
       return if reports.empty? and stats.empty?

data/qnotifier.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{qnotifier}
-  s.version = "0.7.2"
+  s.version = "0.7.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gersham Meharg"]
@@ -11,8 +11,8 @@ Gem::Specification.new do |s|
   s.description = %q{The server side agent for the QNotifier monitoring system.  This software will monitor local Linux system parameters and upload them to the QNotifier servers where users can use iPhone/iPad applications to view those stats and recieve alerts.}
   s.email = %q{gersham@qnotifier.com}
   s.executables = ["qnotifier"]
-  s.extra_rdoc_files = ["bin/qnotifier", "lib/command.rb", "lib/plugin.rb", "lib/qnotifier.rb", "lib/storage.rb", "lib/web_service.rb"]
-  s.files = ["Manifest", "Rakefile", "bin/qnotifier", "config/README", "config/qnotifier_config.yml", "gem-public_cert.pem", "lib/command.rb", "lib/plugin.rb", "lib/qnotifier.rb", "lib/storage.rb", "lib/web_service.rb", "lib/qnotifierd", "plugins/apache.rb", "plugins/iostat.rb", "plugins/mysql.rb", "plugins/network.rb", "plugins/nginx.rb", "plugins/passenger.rb", "plugins/processes.rb", "plugins/rails.rb", "plugins/ruby.rb", "plugins/system.rb", "plugins/urls.rb", "init.d/qnotifier", "qnotifier.gemspec"]
+  s.extra_rdoc_files = ["bin/qnotifier", "lib/plugin.rb", "lib/qnotifier.rb", "lib/storage.rb", "lib/web_service.rb"]
+  s.files = ["Manifest", "Rakefile", "bin/qnotifier", "config/README", "config/qnotifier_config.yml", "gem-public_cert.pem", "lib/plugin.rb", "lib/qnotifier.rb", "lib/storage.rb", "lib/web_service.rb", "plugins/apache.rb", "plugins/iostat.rb", "plugins/mysql.rb", "plugins/network.rb", "plugins/nginx.rb", "plugins/passenger.rb", "plugins/processes.rb", "plugins/rails.rb", "plugins/ruby.rb", "plugins/system.rb", "plugins/urls.rb", "init.d/qnotifier", "qnotifier.gemspec"]
   s.homepage = %q{http://qnotifier.com/qnotifier_gem}
   s.post_install_message = %q{Qnotifier installed,  please register by running 'qnotifier' in order to register this server.}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Qnotifier"]

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 7
-  - 2
-  version: 0.7.2
+  - 3
+  version: 0.7.3
 platform: ruby
 authors: 
 - Gersham Meharg
@@ -166,7 +166,6 @@ extensions: []
 
 extra_rdoc_files: 
 - bin/qnotifier
-- lib/command.rb
 - lib/plugin.rb
 - lib/qnotifier.rb
 - lib/storage.rb
@@ -178,12 +177,10 @@ files:
 - config/README
 - config/qnotifier_config.yml
 - gem-public_cert.pem
-- lib/command.rb
 - lib/plugin.rb
 - lib/qnotifier.rb
 - lib/storage.rb
 - lib/web_service.rb
-- lib/qnotifierd
 - plugins/apache.rb
 - plugins/iostat.rb
 - plugins/mysql.rb

data/lib/command.rb

@@ -1,189 +0,0 @@
-#!/usr/bin/env ruby
-require "qnotifier"
-
-module Qnotifier
-  class Command
-        
-    def self.run(argv)
-      unless Process.euid == 0
-        puts "QNotifier should be only started by root in order to set itself up"
-      end
-      
-      if has_api_key?
-        if argv.first == 'stop'
-          stop
-          
-        elsif argv.first == 'start'
-          start
-          
-        elsif argv.first == 'restart'
-          stop
-          start
-          
-        elsif argv.first == 'zap'
-          zap
-          
-        elsif argv.first == 'reset'
-          print "\nWould you like to reset the state of the saved variables? (y/n):"
-          response = STDIN.gets.chomp.downcase!
-          if response == "y" || response == "yes"
-            `rm /var/lib/qnotifier/saved_variables.yml`
-          end
-          
-        elsif argv.first == 'register'  
-          qnotifier = Qnotifier::MainProcess.new
-          qnotifier.wipe
-          setup_registration
-          
-        elsif argv.first == 'debug'
-          puts "Running once in debug mode (use this mode to debug your plugins)\n\n"
-          qnotifier = Qnotifier::MainProcess.new
-          $qnotifier_debug = true
-          qnotifier.run
-          
-        elsif argv.first == 'setup-directories'
-          setup_directories
-          
-        else
-          puts "usage: qnotifier start | stop | restart | zap | reset | register | debug"
-          puts "see http://qnotifier.com for more details"
-        end
-
-      else
-        setup_directories
-        setup_registration
-      end
-    end
-        
-    def self.has_api_key?
-      api_key = nil
-      begin
-        api_key_file = File.open("/var/lib/qnotifier/api_key")
-        while (line = api_key_file.readline)
-          api_key = line
-        end
-      rescue EOFError 
-      rescue Exception => e
-      end
-      if api_key
-        return true 
-      else 
-        return false
-      end
-    end
-    
-    def self.setup_directories
-      var_dir = "/var/lib/qnotifier"
-      unless File.exists?(var_dir)
-        begin
-          puts "Creating #{var_dir}"
-          FileUtils.mkdir_p var_dir
-          FileUtils.mkdir_p "#{var_dir}/plugins"
-          default_config_file = File.dirname(__FILE__) + "/../config/qnotifier_config.yml"
-          `cp #{default_config_file} #{var_dir}/qnotifier_config.yml`
-          readme_file = File.dirname(__FILE__) + "/../config/README"
-          `cp #{readme_file} #{var_dir}/plugins/README`
-        rescue Exception => e
-          puts "Can't setup the var directory: #{e}"
-          puts "Exiting"
-          exit
-        end
-      end
-    end
-  
-    def self.setup_registration
-      puts "Starting QNotifier Agent Setup\n\n"
-      puts "In order to use this agent you must enter the six number Registration Code that was presented to you when the server was created in the QNotifier system (in the iPhone/iPad/Website).\n\n"
-      print "Registration Code: "
-      register_code = STDIN.gets.chomp
-      
-      if register_code and register_code.size == 6
-        qnotifier = Qnotifier::MainProcess.new
-        if qnotifier.register(register_code) 
-          puts "\nOK, the server has been successfully registered."
-          puts "You now can control the agent as a daemon using 'qnotifier start|stop|restart'"
-          copy_init
-          puts "Doing initial update..."
-          qnotifier.run
-          puts "\nPlease start the qnotifier daemon now ('sudo qnotifier start')"
-        else
-          puts "Exiting."
-        end
-      else
-        puts "\nInvalid code, please enter a six number Registration Code to use this agent.\n"
-        exit
-      end
-    end
-    
-    def self.copy_init
-      print "\nWould you like to install the qnotifier init script in /etc/init.d? (y/n):"
-      response = STDIN.gets.chomp.downcase!
-      if response == "y" || response == "yes"
-        init_file = File.dirname(__FILE__) + "/../init/qnotifier"
-        `cp #{init_file} /etc/init.d/`
-      end
-    end
-    
-    def self.running
-      pid_file = "/var/lib/qnotifier/qnotifer.pid"
-      if File.exists?(pid_file)
-        begin
-          pid = `cat #{pid_file}`.to_i
-          Process.getpgid(pid)
-          return true
-        rescue
-          `rm #{pid_file}`
-          return false
-        end
-      else
-        return false
-      end
-    end
-  
-    def self.zap
-      pid_file = "/var/lib/qnotifier/qnotifer.pid"
-      if File.exists?(pid_file)
-        `rm #{pid_file}`
-      end
-    end
-  
-    def self.start
-      puts "Starting QNotifier..."
-      
-      runlock_file = "/var/lib/qnotifier/.runlock"
-      if File.exists?(runlock_file)
-        `rm #{runlock_file}`
-      end
-      
-      pid_file = "/var/lib/qnotifier/qnotifer.pid"
-      if running
-        puts "Daemon is already running, check pid #{pid_file}"
-        exit
-      end
-      
-      pid = fork do
-        $0 = 'qnotifierd'
-        Process.setsid
-        Process.uid = 65534 if Process.uid == 0
-        exit if fork
-        File.umask 0000
-        STDIN.reopen "/dev/null"
-        STDOUT.reopen "/dev/null", "a"
-        STDERR.reopen STDOUT
-        trap("TERM") {daemon.stop; exit}
-        exec "#{File.dirname(__FILE__) }/qnotifierd"
-      end      
-      Process.detach pid
-    end
-    
-    def self.stop
-      puts "Stopping QNotifier..."
-      pid_file = "/var/lib/qnotifier/qnotifer.pid"
-      if running
-        pid = `cat #{pid_file}`.to_i
-        Process.kill "TERM", pid
-        `rm /var/lib/qnotifier/qnotifer.pid`
-      end
-    end
-  end
-end

data/lib/qnotifierd

@@ -1,8 +0,0 @@
-#!/bin/bash
-echo $$ > /var/lib/qnotifier/qnotifer.pid
-cd `dirname $0`
-while [ 1 ]
-do
-	./qnotifier.rb&
-	sleep 30
-done