Commit: 1425596385054f3a66ec425c64bd057df793bc22 - MyDaemonWrapper4Ruby (git)

"yadaemon.rb" is my daemon wrapper class to protect the multiple process invocation.

Commit MetaInfo

• Revisão: 1425596385054f3a66ec425c64bd057df793bc22 (tree)
• Hora: 2011-01-29 01:25:53
• Autor: Yasuhiro ABE <yasundial@user...>
• Commiter: Yasuhiro ABE

Mensagem de Log

Added force_stop method for emergency stop function.

Mudança Sumário

• modified: sample/change_euid.rb
• modified: sample/start_stop.rb
• modified: yadaemon.rb

Diff

--- a/sample/change_euid.rb
+++ b/sample/change_euid.rb
@@ -19,6 +19,9 @@ daemon = YaDaemon.new(appname,"#{appname}.pid","/tmp", opts)
 if ARGV[0] == "restart"
   begin
     daemon.stop
+    while daemon.check_proc
+      sleep 1
+    end
     puts "running process was terminated."
   rescue
     puts $!
@@ -27,6 +30,9 @@ if ARGV[0] == "restart"
 elsif ARGV[0] == "stop"
   begin
     daemon.stop
+    while daemon.check_proc
+      sleep 1
+    end
     puts "running process was terminated."
   rescue
     puts $!
@@ -47,4 +53,4 @@ daemon.run do |pid|
     sleep 5
   end
 end
-exit(1)
+puts "another daemon is already running" if daemon.running

--- a/sample/start_stop.rb
+++ b/sample/start_stop.rb
@@ -17,6 +17,9 @@ daemon = YaDaemon.new(appname,"#{appname}.pid","/tmp", opts)
 if ARGV[0] == "restart"
   begin
     daemon.stop
+    while daemon.check_proc
+      sleep 1
+    end
     puts "running process was terminated."
   rescue
     puts $!
@@ -25,6 +28,9 @@ if ARGV[0] == "restart"
 elsif ARGV[0] == "stop"
   begin
     daemon.stop
+    while daemon.check_proc
+      sleep 1
+    end
     puts "running process was terminated."
   rescue
     puts $!
@@ -45,3 +51,4 @@ daemon.run do |pid|
     sleep 5
   end
 end
+puts "another daemon is already running" if daemon.running

--- a/yadaemon.rb
+++ b/yadaemon.rb
@@ -133,7 +133,7 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 #
-#
+
 # It's a utility class to process common tasks.
 # These methods should be tested by the unit test script.
 #
@@ -362,37 +362,40 @@ class YaDaemon
     logit "run: return"
   end
   
+  ## safelly 
   def stop
     logit "stop: called"
     
-    ## overwrite @stopfile
     create_stop_file()
-
+  end
+  
+  def force_stop
     if not check_proc
-      logit "stop: this process has already stopped."
+      logit "force_stop: this process has already stopped."
       return
     end
     pid = get_pid
     ## case 1
     if pid == $$
+      create_stop_file()
       exit(0)
     end
     ## case 2
     if pid > 0
       n = Process::kill(15, pid)
       if n > 0
-        logit "stop: the terminate signal succesfully sent." 
+        logit "force_stop: the terminate signal succesfully sent." 
       else
-        logit "stop: failed to sent the terminate signal."
+        logit "force_stop: failed to sent the terminate signal."
       end
       while check_proc 
         logit "stop: waiting terminate process, pid=#{pid}."
         sleep 3
       end
     else
-      logit "stop: failed to get my pid number" 
+      logit "force_stop: failed to get my pid number" 
     end
-    logit "stop: return"
+    logit "force_stop: return"
   end
 
   ## change privileges using from run method, but place here for unit test.