Skip to content
Snippets Groups Projects
Commit 230a77ba authored by junglecow's avatar junglecow
Browse files

- In [7647], reading of PID file was moved out of try..except block. Fixed.

 - [PyOpenSSL] Small fix to error handling.
parent de22ec65
No related branches found
No related tags found
No related merge requests found
...@@ -155,8 +155,15 @@ def pid_alive(): ...@@ -155,8 +155,15 @@ def pid_alive():
except: except:
# probably file not found # probably file not found
return False return False
pid = int(pf.read().strip())
pf.close() try:
pid = int(pf.read().strip())
pf.close()
except:
traceback.print_exc()
# PID file exists, but something happened trying to read PID
# Could be 0.10 style empty PID file, so assume Gajim is running
return True
if os.name == 'nt': if os.name == 'nt':
try: try:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment