From c9ec231483d905f3a391c3985c2c2762344ed5c1 Mon Sep 17 00:00:00 2001 From: Alex Shatov Date: Thu, 14 Jun 2018 12:06:42 -0400 Subject: 3.0.0 policy-handler - migrated to python 3.6 - migrated from python 2.7 to 3.6 - brought up the latest versions of dependencies -- Cherrypy 15.0.0, requests 2.18.4, websocket-client 0.48.0 - fixed migration errors -- renamed the standard package Queue to queue -- dict.items() instead of dict.iteritems() -- dict.keys() instead of dict.viewkeys() -- range() instead of xrange() -- subprocess.check_output(..., universal_newlines=True) to get str instead of byte-stream from stdout - cleaned up migration warnings -- super() instead of super(A, self) -- logger.warning() instead of .warn() - moved main() from policy_handler.py to __main__.py - getting the policy_handler version directly from setup.py instead of the env var on init of the audit Change-Id: I0fc4ddc51c08a64f3cfdc5d2f010b1c6a1ae92f0 Signed-off-by: Alex Shatov Issue-ID: DCAEGEN2-515 --- run_policy.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'run_policy.sh') diff --git a/run_policy.sh b/run_policy.sh index 28b5bf8..b50e8c6 100644 --- a/run_policy.sh +++ b/run_policy.sh @@ -21,12 +21,13 @@ mkdir -p logs LOG_FILE=logs/policy_handler.log echo "---------------------------------------------" >> ${LOG_FILE} 2>&1 -export APP_VER=$(python setup.py --version) -echo "APP_VER=${APP_VER}" | tee -a ${LOG_FILE} - +echo "APP_VER =" $(python setup.py --version) | tee -a ${LOG_FILE} +uname -a | tee -a ${LOG_FILE} echo "/etc/hosts" | tee -a ${LOG_FILE} cat /etc/hosts | tee -a ${LOG_FILE} -python -m policyhandler/policy_handler >> ${LOG_FILE} 2>&1 & +pwd | tee -a ${LOG_FILE} + +python -m policyhandler >> ${LOG_FILE} 2>&1 & PID=$! function finish { @@ -37,7 +38,6 @@ function finish { trap finish SIGHUP SIGINT SIGTERM echo "running policy_handler as" ${PID} "log" ${LOG_FILE} | tee -a ${LOG_FILE} -uname -a | tee -a ${LOG_FILE} free -h | tee -a ${LOG_FILE} df -h | tee -a ${LOG_FILE} ps afxvw | tee -a ${LOG_FILE} -- cgit 1.2.3-korg