- In [7647], reading of PID file was moved out of try..except block. Fixed.
- [PyOpenSSL] Small fix to error handling.
This commit is contained in:
parent
de22ec65de
commit
230a77ba94
1 changed files with 9 additions and 2 deletions
|
@ -155,8 +155,15 @@ def pid_alive():
|
||||||
except:
|
except:
|
||||||
# probably file not found
|
# probably file not found
|
||||||
return False
|
return False
|
||||||
|
|
||||||
|
try:
|
||||||
pid = int(pf.read().strip())
|
pid = int(pf.read().strip())
|
||||||
pf.close()
|
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:
|
||||||
|
|
Loading…
Add table
Reference in a new issue