secrets_new: utilisation d'un vrai logger
Pour éviter de concurrence le syslog perso de l'application qui importe secrets_new (c'est ce qui arrive avec freeradius)
This commit is contained in:
parent
afed588141
commit
bd7bd8eb09
1 changed files with 17 additions and 5 deletions
|
@ -25,14 +25,26 @@ Recuperation des secrets depuis /etc/crans/secrets.
|
||||||
|
|
||||||
import sys
|
import sys
|
||||||
import os
|
import os
|
||||||
from syslog import syslog, openlog
|
import logging
|
||||||
|
import logging.handlers
|
||||||
import getpass
|
import getpass
|
||||||
|
|
||||||
|
# Initialisation d'un logger pour faire des stats etc
|
||||||
|
# pour l'instant, on centralise tout sur thot en mode debug
|
||||||
|
logger = logging.getLogger('secrets_new')
|
||||||
|
logger.setLevel(logging.DEBUG)
|
||||||
|
formatter = logging.Formatter('%(name)s: [%(levelname)s] %(message)s')
|
||||||
|
handler = logging.handlers.SysLogHandler(address = '/dev/log')
|
||||||
|
try:
|
||||||
|
handler.addFormatter(formatter)
|
||||||
|
except AttributeError:
|
||||||
|
handler.formatter = formatter
|
||||||
|
logger.addHandler(handler)
|
||||||
|
|
||||||
def get(secret):
|
def get(secret):
|
||||||
""" Recupere un secret. """
|
""" Récupère un secret. """
|
||||||
openlog('secrets_new')
|
|
||||||
prog = os.path.basename(getattr(sys, 'argv', ['undefined'])[0])
|
prog = os.path.basename(getattr(sys, 'argv', ['undefined'])[0])
|
||||||
syslog('%s (in %s) asked for %s' % (getpass.getuser(), prog, secret))
|
logger.debug('%s (in %s) asked for %s' % (getpass.getuser(), prog, secret))
|
||||||
try:
|
try:
|
||||||
f = open("/etc/crans/secrets/" + secret)
|
f = open("/etc/crans/secrets/" + secret)
|
||||||
result = f.read().strip()
|
result = f.read().strip()
|
||||||
|
@ -45,5 +57,5 @@ def get(secret):
|
||||||
sys.path.pop()
|
sys.path.pop()
|
||||||
return getattr(module, secret)
|
return getattr(module, secret)
|
||||||
except:
|
except:
|
||||||
syslog('...and that failed.')
|
logger.critical('...and that failed.')
|
||||||
raise Exception("Impossible d'acceder au secret %s!" % secret)
|
raise Exception("Impossible d'acceder au secret %s!" % secret)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue