From faeea96d265d1dc607dfc6bf6d6c8123825fe7c2 Mon Sep 17 00:00:00 2001 From: dharmendra kushwaha Date: Mon, 23 Jul 2018 04:44:05 +0000 Subject: [PATCH] Revert "Add log file to tacker-server systemctl daemon script" Due this patch there are some issue with logging: 1: No Tacker logs generating on gate. 2: No logs in journalctl 3: unable to set log location with config file. So here reverting this patch. Closes-Bug: #1782718 This reverts commit 7f60e64bd3cdca461e1e3b507a1b557fd3240a89. Change-Id: I8dd56d049459037a0f5ea5fd11aaa4449fc55f0f --- devstack/lib/tacker | 9 --------- etc/systemd/system/tacker.service | 2 +- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/devstack/lib/tacker b/devstack/lib/tacker index 27103bcbd..084c96ff7 100644 --- a/devstack/lib/tacker +++ b/devstack/lib/tacker @@ -52,9 +52,6 @@ fi TACKER_CONF_DIR=/etc/tacker TACKER_CONF=$TACKER_CONF_DIR/tacker.conf -TACKER_LOG_DIR=/var/log/tacker -TACKER_SERVER_LOG=$TACKER_LOG_DIR/tacker-server.log - # Default name for Tacker database TACKER_DB_NAME=${TACKER_DB_NAME:-tacker} # Default Tacker Port @@ -175,16 +172,10 @@ function _create_tacker_conf_dir { sudo install -d -o $STACK_USER $TACKER_CONF_DIR } -function _create_tacker_log_dir { - # Create Tacker LOG DIR - sudo install -d -o $STACK_USER $TACKER_LOG_DIR -} - # configure_tacker() # Set common config for all tacker server and agents. function configure_tacker { _create_tacker_conf_dir - _create_tacker_log_dir cd $TACKER_DIR ./tools/generate_config_file_sample.sh diff --git a/etc/systemd/system/tacker.service b/etc/systemd/system/tacker.service index 424c355a7..9cdbbac66 100644 --- a/etc/systemd/system/tacker.service +++ b/etc/systemd/system/tacker.service @@ -6,7 +6,7 @@ ExecReload = /bin/kill -HUP $MAINPID TimeoutStopSec = 300 KillMode = process WorkingDirectory = /tmp -ExecStart=/usr/local/bin/tacker-server --config-file /etc/tacker/tacker.conf --log-file /var/log/tacker-server.log +ExecStart=/usr/local/bin/tacker-server --config-file /etc/tacker/tacker.conf [Install] WantedBy = multi-user.target