diff options
author | Alex Shatov <alexs@att.com> | 2018-06-21 09:19:07 -0400 |
---|---|---|
committer | Alex Shatov <alexs@att.com> | 2018-06-21 09:19:07 -0400 |
commit | d444b320dea07248dc69c81d0ce9ea5fc353e701 (patch) | |
tree | cacd244c5e2424faca5e088dc3ca3baf9afd8511 /run_policy.sh | |
parent | c9ec231483d905f3a391c3985c2c2762344ed5c1 (diff) |
3.0.1 policy-handler - cleaning sonar smells
- no change of functionality or API
- removed the unused enum34>=1.1.6 from requirements.txt and setup.py
- refactored run_policy.sh to redirect the stdout+stderr only once
- refactoring to remove smells+vulnerability reported by sonar
-- renamed Config.config to Config.settings
-- removed the commented out code in customizer.py
-- renamed StepTimer.NEXT to StepTimer.STATE_NEXT to avoid the
naming confusion with the method StepTimer.next.
Also renamed the related StepTimer.STATE_* constants
-- refactored several functions by extracting methods to eliminate
4 out of 5 "brain-overload" smells reported by sonar
-- moved the literal string for the socket_host "0.0.0.0" to a
constant on the web-server to avoid the reported vulnerability
Change-Id: I4c7d47d41c6ecd7cb28f6704f5dad2053c1ca7d6
Signed-off-by: Alex Shatov <alexs@att.com>
Issue-ID: DCAEGEN2-515
Diffstat (limited to 'run_policy.sh')
-rw-r--r-- | run_policy.sh | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/run_policy.sh b/run_policy.sh index b50e8c6..a7ddde4 100644 --- a/run_policy.sh +++ b/run_policy.sh @@ -20,29 +20,29 @@ mkdir -p logs LOG_FILE=logs/policy_handler.log -echo "---------------------------------------------" >> ${LOG_FILE} 2>&1 -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} -pwd | tee -a ${LOG_FILE} +exec &>> >(tee -a ${LOG_FILE}) +echo "---------------------------------------------" +STARTED=$(date +%Y-%m-%d_%T.%N) +echo "${STARTED}: running ${BASH_SOURCE[0]}" +echo "APP_VER =" $(python setup.py --version) +(uname -a; echo "/etc/hosts"; cat /etc/hosts; pwd) -python -m policyhandler >> ${LOG_FILE} 2>&1 & +python -m policyhandler & PID=$! function finish { - echo "killing policy_handler ${PID}" $(date +%Y_%m%d-%H:%M:%S.%N) | tee -a ${LOG_FILE} + echo "killing policy_handler ${PID}" $(date +%Y_%m%d-%T.%N) kill -9 ${PID} - echo "killed policy_handler ${PID}" $(date +%Y_%m%d-%H:%M:%S.%N) | tee -a ${LOG_FILE} + echo "killed policy_handler ${PID}" $(date +%Y_%m%d-%T.%N) } trap finish SIGHUP SIGINT SIGTERM -echo "running policy_handler as" ${PID} "log" ${LOG_FILE} | tee -a ${LOG_FILE} -free -h | tee -a ${LOG_FILE} -df -h | tee -a ${LOG_FILE} -ps afxvw | tee -a ${LOG_FILE} -ss -aepi | tee -a ${LOG_FILE} +echo "running policy_handler as ${PID} logs to ${LOG_FILE}" +(free -h; df -h; ps afxvw; ss -aepi) wait ${PID} -echo "---------------------------------------------" >> ${LOG_FILE} 2>&1 +exec &>> >(tee -a ${LOG_FILE}) +echo "---------------------------------------------" +echo "$(date +%Y-%m-%d_%T.%N): exit ${BASH_SOURCE[0]} that was started on ${STARTED}" + mv ${LOG_FILE} ${LOG_FILE}.$(date +%Y-%m-%d_%H%M%S) |