X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=nagixsc%2F__init__.py;h=85f39092a13ab1e105e002bd172e1293b15ebc41;hb=fcf0c6b01294ced1de3f2ef03fc592daa939af06;hp=2a93b864f6315de3a0c7bbc53a506d861962c831;hpb=8ed4dffad9f52651aae67f226fbf01017330f1ea;p=nagixsc.git

diff --git a/nagixsc/__init__.py b/nagixsc/__init__.py
index 2a93b86..85f3909 100644
--- a/nagixsc/__init__.py
+++ b/nagixsc/__init__.py
@@ -198,10 +198,10 @@ def dict2out_passive(checks, xmltimestamp, opt_pipe, opt_verb=0):
 
 		if check['service_description'] == None or check['service_description'] == '':
 			# Host check
-			line = FORMAT_HOST % (now, check['host_name'], check['returncode'], check['output'].replace('\n', '\\n'))
+			line = FORMAT_HOST % (timestamp, check['host_name'], check['returncode'], check['output'].replace('\n', '\\n'))
 		else:
 			# Service check
-			line =  FORMAT_SERVICE % (now, check['host_name'], check['service_description'], check['returncode'], check['output'].replace('\n', '\\n'))
+			line =  FORMAT_SERVICE % (timestamp, check['host_name'], check['service_description'], check['returncode'], check['output'].replace('\n', '\\n'))
 
 		if pipe:
 			pipe.write(line + '\n')
@@ -302,7 +302,7 @@ def write_xml(xmldoc, outfile, httpuser=None, httppasswd=None):
 
 def write_xml_or_die(xmldoc, outfile, httpuser=None, httppasswd=None):
 	try:
-		response = write_xml(xmldoc, outfile, httpuser=None, httppasswd=None)
+		response = write_xml(xmldoc, outfile, httpuser, httppasswd)
 	except urllib2.HTTPError, error:
 		print error
 		sys.exit(11)