Skip to content

Commit 2756730

Browse files
committed
Revert logging until PYTHONPATH issues are sorted.
Fixes #138.
1 parent 736eb73 commit 2756730

File tree

2 files changed

+1
-5
lines changed

2 files changed

+1
-5
lines changed

packaging/datadog-agent/source/supervisord.conf

+1-2
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,11 @@ priority=998
3939
startsecs=3
4040

4141
[program:pup]
42-
command=python pup/pup.py -p 17125
42+
command=python agent/pup/pup.py -p 17125
4343
stdout_logfile=supervisord/logs/pup.log
4444
redirect_stderr=true
4545
priority=998
4646
startsecs=3
47-
directory=agent
4847

4948
[group:datadog-agent]
5049
programs=forwarder,collector,dogstatsd,pup

pup/pup.py

-3
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
from tornado import websocket
2727

2828
# project imports
29-
from config import get_config
3029

3130
logger = logging.getLogger('pup')
3231

@@ -221,8 +220,6 @@ def on_close(self):
221220
def main():
222221
""" Parses arguments and starts Pup server """
223222

224-
# Initialize logging
225-
c = get_config(parse_args=False, cfg_path=None, init_logging=True)
226223
logger.info("Starting pup")
227224

228225
global port

0 commit comments

Comments
 (0)