fix: create appropriate header for the response to the 'mamonsu agent <...>' command

Author: casperr0

mamonsu/tools/agent/agent.py

@@ -38,12 +38,16 @@ def __init__(self, config, *args):
         self.sender = config.sender
         BaseHTTPRequestHandler.__init__(self, *args)
 
-    def do_HEAD(self):
+    def _set_header(self):
         self.send_response(200)
-        self.send_header('Content-type', 'text/html')
+        self.send_header("Content-type", "text/html")
         self.end_headers()
 
+    def do_HEAD(self):
+        self._set_header()
+
     def do_GET(self):
+        self._set_header()
         req = parse(self.path)
         if req.path in '/version':
             self.wfile.write(API.VERSION)

mamonsu/tools/agent/start.py

@@ -7,7 +7,8 @@
 from mamonsu.lib.const import API
 from mamonsu.lib.config import Config
 
-import urllib.request as urllib2
+import urllib.request as urllib
+from urllib.error import URLError, HTTPError
 
 
 def run_agent():
@@ -58,34 +59,32 @@ def print_help():
     else:
         return print_help()
 
-    request = urllib2.Request(url)
+    request = urllib.Request(url)
     try:
-        response = urllib2.urlopen(request)
-    except Exception as e:
+        response = urllib.urlopen(request)
+    except HTTPError as e:
+        sys.stderr.write('The server couldn\'t fulfill the request. : {0}, error: {1}\n'.format(
+           url, e.code))
+        sys.exit(9)
+    except URLError as e:
         sys.stderr.write('Open url: {0}, error: {1}\n'.format(
+            url, e.reason))
+        sys.exit(8)
+
+    try:
+        body = response.read()
+    except Exception as e:
+        sys.stderr.write('Read url: {0}, error: {1}\n'.format(
             url, e))
         sys.exit(9)
-
-    if not response.code == 200:
-        sys.stderr.write('Bad response from url {0}, code: {1}\n'.format(
-            url,
-            response.code))
-        sys.exit(8)
+    if body == API.UNKNOWN_VERSION:
+        sys.stderr.write('Unknown API version\n')
+        sys.exit(9)
+    elif body == API.METRIC_NOT_FOUND and key is not None:
+        sys.stderr.write('Metric \'{0}\' not found\n'.format(key))
+        sys.exit(9)
+    elif body == API.METRIC_NOT_FOUND and key is None:
+        sys.stderr.write('Unknown API version\n')
+        sys.exit(9)
     else:
-        try:
-            body = response.read()
-        except Exception as e:
-            sys.stderr.write('Read url: {0}, error: {1}\n'.format(
-                url, e))
-            sys.exit(9)
-        if body == API.UNKNOWN_VERSION:
-            sys.stderr.write('Unknown API version\n')
-            sys.exit(9)
-        elif body == API.METRIC_NOT_FOUND and key is not None:
-            sys.stderr.write('Metric \'{0}\' not found\n'.format(key))
-            sys.exit(9)
-        elif body == API.METRIC_NOT_FOUND and key is None:
-            sys.stderr.write('Unknown API version\n')
-            sys.exit(9)
-        else:
-            print(body)
+        print(body.decode("utf8"))

mamonsu/tools/agent/start.py.bak

@@ -0,0 +1,92 @@
+# -*- coding: utf-8 -*-
+import sys
+import optparse
+
+from mamonsu import __version__
+from mamonsu.lib.const import API
+from mamonsu.lib.config import Config
+import mamonsu.lib.platform as platform
+
+if platform.PY3:
+    import urllib.request as urllib2
+else:
+    import urllib2
+
+
+def run_agent():
+
+    def print_help():
+        print(usage_msg)
+        sys.exit(7)
+
+    usage_msg = """
+{prog} agent [OPTIONS] COMMANDS
+
+Examples:
+    {prog} agent version
+    {prog} agent metric-list
+    {prog} agent metric-get <metric key>
+""".format(prog=sys.argv[0])
+
+    parser = optparse.OptionParser(
+        usage=usage_msg,
+        version='%prog agent {0}'.format(__version__))
+    parser.add_option(
+        '-c', '--config', dest='config',
+        help=optparse.SUPPRESS_HELP)
+    args, commands = parser.parse_args()
+
+    cfg = Config(args.config)
+    host = cfg.fetch('agent', 'host')
+    port = cfg.fetch('agent', 'port', int)
+    url, key = None, None
+
+    if len(commands) == 0:
+        return print_help()
+    if commands[0] == 'version':
+        if len(commands) >= 2:
+            return print_help()
+        url = 'http://{0}:{1}/version'.format(host, port)
+    elif commands[0] == 'metric-list':
+        if len(commands) >= 2:
+            return print_help()
+        url = 'http://{0}:{1}/list'.format(host, port)
+    elif commands[0] == 'metric-get':
+        if not len(commands) == 2:
+            return print_help()
+        key = commands[1]
+        url = 'http://{0}:{1}/get?key={2}'.format(host, port, key)
+    else:
+        return print_help()
+
+    request = urllib2.Request(url)
+    try:
+        response = urllib2.urlopen(request)
+    except Exception as e:
+        sys.stderr.write('Open url: {0}, error: {1}\n'.format(
+            url, e))
+        sys.exit(9)
+
+    if not response.code == 200:
+        sys.stderr.write('Bad response from url {0}, code: {1}\n'.format(
+            url,
+            response.code))
+        sys.exit(8)
+    else:
+        try:
+            body = response.read()
+        except Exception as e:
+            sys.stderr.write('Read url: {0}, error: {1}\n'.format(
+                url, e))
+            sys.exit(9)
+        if body == API.UNKNOWN_VERSION:
+            sys.stderr.write('Unknown API version\n')
+            sys.exit(9)
+        elif body == API.METRIC_NOT_FOUND and key is not None:
+            sys.stderr.write('Metric \'{0}\' not found\n'.format(key))
+            sys.exit(9)
+        elif body == API.METRIC_NOT_FOUND and key is None:
+            sys.stderr.write('Unknown API version\n')
+            sys.exit(9)
+        else:
+            print(body)