2
0
mirror of https://github.com/xcat2/confluent.git synced 2025-01-17 13:13:18 +00:00

Fix pid file creation

The windows support to 'gracefully' deal with no fcntl
incorrectly broke fcntl usage under linux in main.  Fix
the check to be accurate.
This commit is contained in:
Jarrod Johnson 2015-10-14 15:30:43 -04:00
parent 7b26d2edfb
commit d4828b2115

View File

@ -41,10 +41,11 @@ except ImportError:
pass
import eventlet
#import eventlet.backdoor as backdoor
havefcntl = True
try:
import fcntl
except ImportError:
pass
havefcntl = False
#import multiprocessing
import sys
import os
@ -120,7 +121,7 @@ def terminate(signalname, frame):
def doexit():
if 'fcntl' not in locals():
if havefcntl:
return
pidfile = open('/var/run/confluent/pid')
pid = pidfile.read()
@ -137,7 +138,7 @@ def _initsecurity(config):
def run():
if 'fcntl' in locals():
if havefcntl:
_checkpidfile()
conf.init_config()
try:
@ -153,7 +154,7 @@ def run():
doexit()
raise
_daemonize()
if 'fcntl' in locals():
if havefcntl:
_updatepidfile()
auth.init_auth()
signal.signal(signal.SIGINT, terminate)