qnotifier 0.6.9 → 0.7.0

data/lib/command.rb

@@ -1,14 +1,12 @@
 #!/usr/bin/env ruby
 require "qnotifier"
-require "robustthread"
 
 module Qnotifier
   class Command
         
     def self.run(argv)
       unless Process.euid == 0
-        puts "QNotifier can only be started by root"
-        exit
+        puts "QNotifier should be only started by root in order to set itself up"
       end
       
       if has_api_key?
@@ -43,6 +41,9 @@ module Qnotifier
           $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"
@@ -148,6 +149,12 @@ module Qnotifier
   
     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}"
@@ -155,15 +162,29 @@ module Qnotifier
       end
       
       pid = fork do
-        qnotifier = Qnotifier::MainProcess.new
-        RobustThread.loop(:seconds => 30) do
-          qnotifier.run
+        $0 = 'qnotifierd'
+        Process.setsid
+        Process.uid = 65534 if Process.euid == 0
+        exit if fork
+        `echo #{Process.pid} > /var/lib/qnotifier/qnotifer.pid`
+        Dir.chdir "/var/lib/qnotifier" 
+        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
+            $0 = 'qnotifier-runner'
+            `touch /tmp/running-#{Process.pid}`
+            qnotifier = Qnotifier::MainProcess.new
+            qnotifier.run
+          end
+          Process.detach cpid
+          sleep 30
         end
-        sleep
-      end
+      end      
       Process.detach pid
-      `echo #{pid} > /var/lib/qnotifier/qnotifer.pid`
-      puts "Running (#{pid})"
     end
     
     def self.stop

data/lib/qnotifier.rb

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__))) unless $LOAD_PATH.include?(File.expand_path(File.dirname(__FILE__)))
+
 require "yaml"
 require "timeout"
 require "logger"
@@ -43,6 +45,14 @@ module Qnotifier
     end
     
     def run
+      runlock_file = "/var/lib/qnotifier/.runlock"
+      if File.exists?(runlock_file)
+        puts "Runlock exists at #{runlock_file} - process already running? Exiting."
+        exit
+      else
+        `echo #{Process.pid} > #{runlock_file}`
+      end
+      
       start_logging
       load_config
       
@@ -83,6 +93,8 @@ module Qnotifier
       
       # Done, clean up and save
       Qnotifier::Storage.save
+      
+      `rm #{runlock_file}`
     end
     
     def process_plugin_file(file)
@@ -179,4 +191,8 @@ module Qnotifier
       end
     end
   end
-end
+end
+
+# The main part of the script
+qnotifier = Qnotifier::MainProcess.new
+qnotifier.run

data/qnotifier.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{qnotifier}
-  s.version = "0.6.9"
+  s.version = "0.7.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gersham Meharg"]

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 6
-  - 9
-  version: 0.6.9
+  - 7
+  - 0
+  version: 0.7.0
 platform: ruby
 authors: 
 - Gersham Meharg