Fixed tm_log

tiny-dhcp-server.py

@@ -95,7 +95,7 @@ def logfile():
  return arg_log_file if arg_log_file is not None else '/var/log/tiny-dhcp-server.log'
 def log(s):
  with open(logfile(), "a") as myfile:
- myfile.write('%s %s\n' % (tm_log(), s))
+ myfile.write('%s %s\n' % (tu.tm_log(), s))
 def log_discard(what):
  if arg_daemonize:
  with open(logfile(), "a") as myfile:

tiny-udp-anti-nat.py

@@ -100,7 +100,7 @@ def logfile():
 
 def log(s):
  with open(logfile(), "a") as myfile:
- myfile.write('%s %s\n' % (tm_log(), s))
+ myfile.write('%s %s\n' % (tu.tm_log(), s))
 
 def unpack_ip(pkt, off):
  return pkt[off:off+4]

tiny-udp-proxy.py

@@ -135,15 +135,13 @@ def logfile():
  return '/var/log/tiny-udp-proxy.log'
 def logfile_pkt():
  return '/var/log/tiny-udp-proxy-pkts.log'
-def tm_log():
- return datetime.datetime.now().strftime('[%Y-%m-%d %H:%M:%S]')
 def tm_ms():
  global timer_process_start
  return '%0.3f' % (timer() - timer_process_start)
 def log(s):
  print("LOG %s" % (s))
  with open(logfile(), "a") as myfile:
- myfile.write('%s %s %s\n' % (tm_ms(), tm_log(), s))
+ myfile.write('%s %s %s\n' % (tm_ms(), tu.tm_log(), s))
 def log_pkt(is_req, ip, port, data):
  if do_log_packets:
  with open(logfile_pkt(), "a") as myfile:
@@ -155,7 +153,7 @@ def log_pkt(is_req, ip, port, data):
 def log_discard(s):
  print("DISCARDED %s" % (s))
  with open(logfile(), "a") as myfile:
- myfile.write('%s packet discarded: %s %s\n' % (tm_ms(), tm_log(), s))
+ myfile.write('%s packet discarded: %s %s\n' % (tm_ms(), tu.tm_log(), s))
 
 ###
 ### BEGIN Packet generator