From 73d927a2a7f3555551632ee54b7bbd445c3908ae Mon Sep 17 00:00:00 2001
From: Guido Trotter <ultrotter@google.com>
Date: Wed, 23 Jul 2008 14:23:43 +0000
Subject: [PATCH] ganeti-noded: write and remove pid file
Reviewed-by: iustinp
---
daemons/ganeti-noded | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/daemons/ganeti-noded b/daemons/ganeti-noded
index 2a3feedb9..2ebc685cc 100755
--- a/daemons/ganeti-noded
+++ b/daemons/ganeti-noded
@@ -615,6 +615,8 @@ def main():
if options.fork:
utils.Daemonize(logfile=constants.LOG_NODESERVER)
+ utils.WritePidFile('ganeti-noded')
+
logger.SetupDaemon(logfile=constants.LOG_NODESERVER, debug=options.debug,
stderr_logging=not options.fork)
logging.info("ganeti node daemon startup")
@@ -624,7 +626,11 @@ def main():
else:
server = NodeDaemonHttpServer(('', port))
- server.serve_forever()
+ try:
+ server.serve_forever()
+ finally:
+ utils.RemovePidFile('ganeti-noded')
+
if __name__ == '__main__':
main()
--
GitLab