summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormartinko2013-04-30 09:38:00 +0000
committermartinko2013-04-30 09:38:00 +0000
commit19573b0909b370bff83363ca939a13badf32d95f (patch)
tree606a123600b0c3447878e3731c6d0ec5b451d5f7
parent12337937d4abf65bafafbb98aefb8751f807ed97 (diff)
skytools.skylog: moved hostaddr resolving to module init
No need to do it per log call as hostname is constant currently.
-rw-r--r--python/skytools/skylog.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/python/skytools/skylog.py b/python/skytools/skylog.py
index e3f63086..02c7687e 100644
--- a/python/skytools/skylog.py
+++ b/python/skytools/skylog.py
@@ -28,10 +28,15 @@ logging.addLevelName(TRACE, 'TRACE')
_service_name = 'unknown_svc'
_job_name = 'unknown_job'
_hostname = socket.gethostname()
+try:
+ _hostaddr = socket.gethostbyname(_hostname)
+except:
+ _hostaddr = "0.0.0.0"
_log_extra = {
'job_name': _job_name,
'service_name': _service_name,
'hostname': _hostname,
+ 'hostaddr': _hostaddr,
}
def set_service_name(service_name, job_name):
"""Set info about current script."""
@@ -110,10 +115,7 @@ class UdpLogServerHandler(logging.handlers.DatagramHandler):
msg = msg[:self.MAXMSG]
txt_level = self._level_map.get(record.levelno, "ERROR")
hostname = _hostname
- try:
- hostaddr = socket.gethostbyname(hostname)
- except:
- hostaddr = "0.0.0.0"
+ hostaddr = _hostaddr
jobname = _job_name
svcname = _service_name
pkt = self._log_template % (time.time()*1000, txt_level, skytools.quote_json(msg),