Merge 61cf4c2027 into f1647f2c9e

speedtest_cli.py

@@ -30,6 +30,8 @@ import re
 import signal
 import socket
 
+import imp
+
 # Used for bound_interface
 socket_socket = socket.socket
 
@@ -469,7 +471,12 @@ def speedtest():
     parser.add_argument('--version', action='store_true',
                         help='Show the version number and exit')
 
+    parser.add_argument('--resultlog', action='store',
+                        help='Module name to use for result logging',
+                        default=None, metavar='path.to.module')
+
     options = parser.parse_args()
+
     if isinstance(options, tuple):
         args = options[0]
     else:
@@ -571,6 +578,7 @@ def speedtest():
             best = getBestServer(servers)
         except:
             best = servers[0]
+
     else:
         if not args.simple:
             print_('Selecting best server based on ping...')
@@ -662,6 +670,19 @@ def speedtest():
         print_('Share results: http://www.speedtest.net/result/%s.png' %
                resultid[0])
 
+    if args.resultlog:
+        logmodule = None
+        try:
+            found = imp.find_module(args.resultlog)
+            logmodule = imp.load_module(args.resultlog, found)
+        except ImportError:
+            print_('Log module (%s) failed. Not logging.' % args.resultlog),
+            sys.exit(1)
+
+        result = {'dlspeed': dlspeed, 'ulspeed': ulspeed}
+        log = logmodule.logger(config, best, result)
+        log.logresult()
+
 
 def main():
     try: