summaryrefslogtreecommitdiffstats
path: root/pavement.py
diff options
context:
space:
mode:
authorAndrey Mekin <amekin@crystalnix.com>2016-01-14 17:24:03 +0600
committerAndrey Mekin <amekin@crystalnix.com>2016-01-15 17:17:24 +0600
commitf1c46bc4a927fc3cd2a474df45bd4a8ec32f8ad3 (patch)
tree1ca51a71c009340712d3d9d48d9ffa95485029c5 /pavement.py
parentaa1e5475e7ed2e9f067db85ae1cbe5f9a28b7e63 (diff)
downloadomaha-server-f1c46bc4a927fc3cd2a474df45bd4a8ec32f8ad3.zip
omaha-server-f1c46bc4a927fc3cd2a474df45bd4a8ec32f8ad3.tar.gz
omaha-server-f1c46bc4a927fc3cd2a474df45bd4a8ec32f8ad3.tar.bz2
Add logging using UDP Splunk port
Diffstat (limited to 'pavement.py')
-rw-r--r--pavement.py24
1 files changed, 13 insertions, 11 deletions
diff --git a/pavement.py b/pavement.py
index 478f184..cfbb606 100644
--- a/pavement.py
+++ b/pavement.py
@@ -90,18 +90,20 @@ def migrate():
def create_admin():
sh('./createadmin.py', cwd='omaha_server')
+
@task
-def configure_splunk_forwarder():
- hostname = os.environ.get('HOST_NAME')
+def configure_nginx():
splunk_host = os.environ.get('SPLUNK_HOST')
- splunk_receiving_port = os.environ.get('SPLUNK_RECEIVING_PORT', 9997)
- if splunk_host:
- try:
- sh('/opt/splunkforwarder/bin/splunk add forward-server %s:%s --accept-license -auth admin:changeme' % (splunk_host, splunk_receiving_port))
- sh('/opt/splunkforwarder/bin/splunk add monitor /var/log/nginx -index main -sourcetype Nginx')
- sh('echo "[default] \nhost = %s \n" > /opt/splunkforwarder/etc/system/local/inputs.conf' % hostname)
- except:
- pass
+ splunk_port = os.environ.get('SPLUNK_PORT', '')
+ if splunk_host and splunk_port.isdigit():
+ sh("sed -i 's/access_log.*;/access_log syslog:server=%s:%s main;/g' /etc/nginx/nginx.conf" % (splunk_host, splunk_port))
+ sh("sed -i 's/error_log.*;/error_log syslog:server=%s:%s;/g' /etc/nginx/nginx.conf" % (splunk_host, splunk_port))
+ else:
+ sh("sed -i 's#access_log.*;#access_log /var/log/nginx/access.log main;#g' /etc/nginx/nginx.conf")
+ sh("sed -i 's#error_log.*;#error_log /var/log/nginx/error.log;#g' /etc/nginx/nginx.conf")
+ server_name = os.environ.get('HOST_NAME', '_')
+ sh("sed -i 's/server_name.*;/server_name %s;/g' /etc/nginx/sites-enabled/nginx-app.conf" % (server_name))
+
@task
def docker_run():
@@ -114,7 +116,7 @@ def docker_run():
create_admin()
collectstatic()
- configure_splunk_forwarder()
+ configure_nginx()
sh('/usr/bin/supervisord')
except:
client.captureException()