git://git.onelab.eu
/
nodemanager.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e4069fd
)
fix writing of str on os.open'ed file (needed bytes)
author
Thierry Parmentelat
<thierry.parmentelat@inria.fr>
Sun, 30 Dec 2018 13:18:17 +0000
(14:18 +0100)
committer
Thierry Parmentelat
<thierry.parmentelat@inria.fr>
Sun, 30 Dec 2018 13:18:17 +0000
(14:18 +0100)
logger.py
patch
|
blob
|
history
diff --git
a/logger.py
b/logger.py
index
569d2e0
..
6a5d0dd
100644
(file)
--- a/
logger.py
+++ b/
logger.py
@@
-1,7
+1,11
@@
+"""
+A very simple logger that tries to be concurrency-safe.
+"""
-"""A very simple logger that tries to be concurrency-safe."""
+# pylint: disable=c0111
-import os, sys
+import sys
+import os
import time
import traceback
import subprocess
import time
import traceback
import subprocess
@@
-20,24
+24,26
@@
LOG_LEVEL = LOG_NODE
def set_level(level):
global LOG_LEVEL
def set_level(level):
global LOG_LEVEL
- try:
- assert level in [LOG_NONE, LOG_NODE, LOG_VERBOSE]
+ if level in (LOG_NONE, LOG_NODE, LOG_VERBOSE):
LOG_LEVEL = level
LOG_LEVEL = level
- e
xcept
:
- log
ger.log
("Failed to set LOG_LEVEL to %s" % level)
+ e
lse
:
+ log("Failed to set LOG_LEVEL to %s" % level)
def verbose(msg):
log('(v) ' + msg, LOG_VERBOSE)
def log(msg, level=LOG_NODE):
def verbose(msg):
log('(v) ' + msg, LOG_VERBOSE)
def log(msg, level=LOG_NODE):
- """Write <msg> to the log file if level >= current log level (default LOG_NODE)."""
+ """
+ Write <msg> to the log file if level >= current log level (default LOG_NODE).
+ """
if level > LOG_LEVEL:
return
try:
fd = os.open(LOG_FILE, os.O_WRONLY | os.O_CREAT | os.O_APPEND, 0o600)
if not msg.endswith('\n'):
msg += '\n'
if level > LOG_LEVEL:
return
try:
fd = os.open(LOG_FILE, os.O_WRONLY | os.O_CREAT | os.O_APPEND, 0o600)
if not msg.endswith('\n'):
msg += '\n'
- os.write(fd, '%s: %s' % (time.asctime(time.gmtime()), msg))
+ to_write = '%s: %s' % (time.asctime(time.gmtime()), msg)
+ os.write(fd, to_write.encode())
os.close(fd)
except OSError:
sys.stderr.write(msg)
os.close(fd)
except OSError:
sys.stderr.write(msg)