From a14a52fe110db956e50365c25f41b90bbfe5e9f6 Mon Sep 17 00:00:00 2001 From: Pieter Naaijkens Date: Tue, 7 Jun 2011 21:57:00 +0200 Subject: [PATCH 1/3] Remove pidfile on shutdown --- radicale.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/radicale.py b/radicale.py index a5349b57..29011064 100755 --- a/radicale.py +++ b/radicale.py @@ -159,3 +159,7 @@ finally: "Closing server listening to %s port %s" % ( server.server_name, server.server_port)) server.shutdown() + + # remove pidfile + if options.pid: + os.unlink(options.pid) From 4acc9effb89515dda7882b5c57b6c1f2c9c06ba1 Mon Sep 17 00:00:00 2001 From: Pieter Naaijkens Date: Tue, 7 Jun 2011 21:59:31 +0200 Subject: [PATCH 2/3] Fix amount of whitespace --- radicale.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/radicale.py b/radicale.py index 29011064..e4746f0d 100755 --- a/radicale.py +++ b/radicale.py @@ -162,4 +162,4 @@ finally: # remove pidfile if options.pid: - os.unlink(options.pid) + os.unlink(options.pid) From 303dc4d3126b699aea9f00b681ef8868ddac8108 Mon Sep 17 00:00:00 2001 From: Pieter Naaijkens Date: Tue, 7 Jun 2011 22:24:04 +0200 Subject: [PATCH 3/3] Only remove pid file if started as daemon --- radicale.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/radicale.py b/radicale.py index e4746f0d..de2e5c72 100755 --- a/radicale.py +++ b/radicale.py @@ -161,5 +161,5 @@ finally: server.shutdown() # remove pidfile - if options.pid: + if options.pid and options.daemon: os.unlink(options.pid)