1.1 --- a/src/passwordreceiver.py Wed Aug 20 16:50:52 2014 +0200
1.2 +++ b/src/passwordreceiver.py Wed Aug 20 17:05:56 2014 +0200
1.3 @@ -5,14 +5,14 @@
1.4 import netifaces
1.5 import os
1.6 import sys
1.7 -import logging
1.8 +#import logging
1.9
1.10 opensecurity_urls = (
1.11 '/password', 'os_password',
1.12 '/init', 'os_init'
1.13 )
1.14
1.15 -__LOG = logging.getLogger("passwordreceiver")
1.16 +#__LOG = logging.getLogger("passwordreceiver")
1.17
1.18 class os_password:
1.19
1.20 @@ -72,27 +72,27 @@
1.21 os.remove(keyfilepath)
1.22
1.23 def runPreInitScript(self, preinitscript, device):
1.24 - __LOG.debug("Start preinit Script")
1.25 + #__LOG.debug("Start preinit Script")
1.26
1.27 command = [preinitscript, device]
1.28 process = subprocess.Popen( command, stdout=subprocess.PIPE, stderr=subprocess.PIPE )
1.29 retval = process.wait()
1.30 ( stdout, stderr ) = process.communicate()
1.31
1.32 - __LOG.debug("preinit done result: %s" %(result,))
1.33 + #__LOG.debug("preinit done result: %s" %(result,))
1.34
1.35 if (retval != 0):
1.36 raise web.badrequest(stderr)
1.37
1.38 def runPostInitScript(self, postinitscript):
1.39 - __LOG.debug("Start postinit Script")
1.40 + #__LOG.debug("Start postinit Script")
1.41
1.42 - command = [postinitscript, device]
1.43 + command = [postinitscript]
1.44 process = subprocess.Popen( command, stdout=subprocess.PIPE, stderr=subprocess.PIPE )
1.45 retval = process.wait()
1.46 ( stdout, stderr ) = process.communicate()
1.47
1.48 - __LOG.debug("postinit done result: %s" %(result,))
1.49 + #__LOG.debug("postinit done result: %s" %(result,))
1.50
1.51 if (retval != 0):
1.52 raise web.badrequest(stderr)
1.53 @@ -119,7 +119,7 @@
1.54 else:
1.55 command = [settings["script"], settings["device"], settings["mountpoint"], args["password"]]
1.56
1.57 - __LOG.debug("Start init script")
1.58 + #__LOG.debug("Start init script")
1.59
1.60 process = subprocess.Popen( command, stdout=subprocess.PIPE, stderr=subprocess.PIPE )
1.61 retval = process.wait()
1.62 @@ -128,7 +128,7 @@
1.63 if "keyfile" in args:
1.64 self.deleteKeyfile(settings["keyfilepath"])
1.65
1.66 - __LOG.debug("init done result: %s" %(result,))
1.67 + #__LOG.debug("init done result: %s" %(result,))
1.68
1.69 if (retval != 0):
1.70 raise web.badrequest(stderr)