From 6e5a7e15d9cf8277f57dda259194618bce601c44 Mon Sep 17 00:00:00 2001
From: Jarrod Johnson <jjohnson2@lenovo.com>
Date: Tue, 28 Jul 2015 10:53:15 -0400
Subject: [PATCH] Cleanup pid on abnormal exit

If unlocking the security keys or loading the
plugins experiences an error, do not leave a
stale pid file behind.
---
 confluent_server/confluent/main.py | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/confluent_server/confluent/main.py b/confluent_server/confluent/main.py
index 7d9577c1..8533d551 100644
--- a/confluent_server/confluent/main.py
+++ b/confluent_server/confluent/main.py
@@ -129,8 +129,17 @@ def run():
     configfile = "/etc/confluent/service.cfg"
     config = ConfigParser.ConfigParser()
     config.read(configfile)
-    _initsecurity(config)
-    confluentcore.load_plugins()
+    try:
+        _initsecurity(config)
+    except:
+        sys.stderr.write("Error unlocking credential store\n")
+        doexit()
+        sys.exit(1)
+    try:
+        confluentcore.load_plugins()
+    except:
+        doexit()
+        raise
     _daemonize()
     _updatepidfile()
     auth.init_auth()