diff --git a/agent.py b/agent.py index 21a8021863..ed156b96e6 100755 --- a/agent.py +++ b/agent.py @@ -350,7 +350,6 @@ def main(): return Agent.info(verbose=options.verbose) elif 'foreground' == command: - logging.info('Running in foreground') if autorestart: # Set-up the supervisor callbacks and fork it. logging.info('Running Agent with auto-restart ON') diff --git a/daemon.py b/daemon.py index c4259cf3e4..c0955f51f2 100644 --- a/daemon.py +++ b/daemon.py @@ -24,6 +24,7 @@ log = logging.getLogger(__name__) + class AgentSupervisor(object): ''' A simple supervisor to keep a restart a child on expected auto-restarts ''' @@ -152,7 +153,6 @@ def daemonize(self): log.info("Daemon started") - def start(self, foreground=False): log.info("Starting") pid = self.pid() @@ -168,13 +168,11 @@ def start(self, foreground=False): log.warn("pidfile doesn't contain the pid of an agent process." ' Starting normally') - log.info("Pidfile: %s" % self.pidfile) if not foreground: self.daemonize() self.write_pidfile() self.run() - def stop(self): log.info("Stopping daemon") pid = self.pid() @@ -211,13 +209,11 @@ def stop(self): return # Not an error in a restart - def restart(self): "Restart the daemon" self.stop() self.start() - def run(self): """ You should override this method when you subclass Daemon. It will be called after the process has been @@ -233,7 +229,6 @@ def info(cls): """ raise NotImplementedError - def status(self): """ Get the status of the daemon. Exits with 0 if running, 1 if not. @@ -268,7 +263,6 @@ def status(self): sys.stdout.write(message + "\n") sys.exit(exit_code) - def pid(self): # Get the pid from the pidfile try: @@ -281,7 +275,6 @@ def pid(self): except ValueError: return None - def write_pidfile(self): # Write pidfile atexit.register(self.delpid) # Make sure pid file is removed if we quit @@ -297,7 +290,6 @@ def write_pidfile(self): sys.stderr.write(msg + "\n") sys.exit(1) - def delpid(self): try: os.remove(self.pidfile) diff --git a/dogstatsd.py b/dogstatsd.py index d8fb31f2f3..863d59dee8 100755 --- a/dogstatsd.py +++ b/dogstatsd.py @@ -473,8 +473,6 @@ def init(config_path=None, use_watchdog=False, use_forwarder=False, args=None): sleep(4) sys.exit(0) - log.debug("Configuring dogstatsd") - port = c['dogstatsd_port'] interval = DOGSTATSD_FLUSH_INTERVAL api_key = c['api_key'] diff --git a/utils/proxy.py b/utils/proxy.py index 2feb1c0509..14c6c7dcfe 100644 --- a/utils/proxy.py +++ b/utils/proxy.py @@ -47,7 +47,7 @@ def get_proxy(agentConfig): proxy_settings['user'] = agentConfig.get('proxy_user') proxy_settings['password'] = agentConfig.get('proxy_password') log.debug("Proxy Settings: %s:*****@%s:%s", proxy_settings['user'], - proxy_settings['host'], proxy_settings['port']) + proxy_settings['host'], proxy_settings['port']) return proxy_settings # If no proxy configuration was specified in datadog.conf @@ -62,13 +62,11 @@ def get_proxy(agentConfig): proxy_settings['password'] = parse.password log.debug("Proxy Settings: %s:*****@%s:%s", proxy_settings['user'], - proxy_settings['host'], proxy_settings['port']) + proxy_settings['host'], proxy_settings['port']) return proxy_settings except Exception as e: log.debug("Error while trying to fetch proxy settings using urllib %s." "Proxy is probably not set", str(e)) - log.debug("No proxy configured") - return None