|
@@ -1,5 +1,8 @@
|
|
|
#!/usr/bin/env python
|
|
|
|
|
|
+from time import time
|
|
|
+start = time()
|
|
|
+
|
|
|
import os
|
|
|
|
|
|
os.environ['DJANGO_SETTINGS_MODULE'] = 'mymontools.settings'
|
|
@@ -51,7 +54,7 @@ def logit(prio, msg):
|
|
|
|
|
|
##############################################################################
|
|
|
|
|
|
-logit(2, 'Traphandler started')
|
|
|
+logit(1, 'Traphandler started')
|
|
|
|
|
|
lines = sys.stdin.readlines()
|
|
|
|
|
@@ -115,7 +118,7 @@ except:
|
|
|
logit(0, u'Could not save trap, exiting...')
|
|
|
sys.exit(1)
|
|
|
|
|
|
-logit(2, u'Trap saved: %s' % trap)
|
|
|
+logit(2, u'Trap saved: %s (runtime: %-.3fs)' % (trap, (time() - start),) )
|
|
|
|
|
|
# Save VarBindings
|
|
|
for (oid, value) in varbinds.iteritems():
|
|
@@ -128,7 +131,7 @@ for (oid, value) in varbinds.iteritems():
|
|
|
except:
|
|
|
logit(0, u'Could not save one VarBinding')
|
|
|
|
|
|
-logit(2, u'VarBindings saved')
|
|
|
+logit(2, u'VarBindings saved (runtime: %-.3fs)' % (time() - start) )
|
|
|
|
|
|
##############################################################################
|
|
|
|
|
@@ -137,7 +140,7 @@ oidname = translate_trapoid_to_name(trap.trapoid)
|
|
|
if oidname:
|
|
|
trap.trapname = oidname
|
|
|
trap.save()
|
|
|
- logit(3, u'Trap-OID translated')
|
|
|
+ logit(3, u'Trap-OID translated (runtime: %-.3fs)' % (time() - start) )
|
|
|
else:
|
|
|
logit(3, u'Trap-OID could not be translated')
|
|
|
|
|
@@ -153,10 +156,9 @@ if cfgtrap:
|
|
|
trap.category = cfgtrap.category
|
|
|
trap.severity = cfgtrap.severity
|
|
|
trap.save()
|
|
|
- syslog.syslog(syslog.LOG_NOTICE, u'Trap categorized')
|
|
|
- logit(3, u'Trap config found, trap categorized')
|
|
|
+ logit(3, u'Trap config found, trap categorized (runtime: %-.3fs)' % (time() - start) )
|
|
|
else:
|
|
|
- logit(2, u'No Trap config found for trap %s' % trap.trapoid)
|
|
|
+ logit(2, u'No Trap config found for trap %s (runtime: %-.3fs)' % (trap.trapoid, (time() - start),) )
|
|
|
|
|
|
-logit(2, u'Traphandler finished')
|
|
|
+logit(1, u'Traphandler finished (runtime: %-.3fs)' % (time() - start) )
|
|
|
|