Merge pull request #5 from supriyopaul/master

deleted dependency on some functions not supported any more by logagg-utils

.travis.yml

@@ -7,8 +7,8 @@ deploy:
   - provider: releases
     api_key:
       secure: 7Ewi6ZT+m/Grl/x6HrlujUwYRA8U6aWO0JuGOHriXvHqfpVhqGDe2Kz6LEQiWmz/siS/BULAxBytIAyG1rjIHb3gKkB6Ua2XqoYwwYKwJmvwuMaWsaRGD62mIMJNnjjTPjFeWQxKXP0hLppocnjujxBwct3Awfr3PnaOI47GJgSWh/Y1onpW8hzFLLrgUczjxSOKU98MKKy1bLqkGWcM/aQ5fAUCRzijVb9IOx0IE51WKxhlu8Xv6FBwAeLdr24nsjYtvwv2Y6OgIMB50lrkqI35TVXJbINw2/wZj5cSr4kM6pkUXFECVGCkWq0V5PnHPt064hdNO3pV0JdUNj1eY0uCJG8SBY3s4p7DfVxDPF39jAWQ5YDTIxIcJqxzNtOi8KZhFrJGRTn16ejKrk9K7YzAfS7/gFJm0UgAQ96VPC+XQI3ZL95c8C66c3/KGlVDYy0Fs/OVeWNd41JfnWidJIgmzWEeU2TBbHDfeXRwwgjZpmAg8gEks9kt+sQp/5iRemmdmxW5GsoVfBShYclMBDYW2WKkJklquHpgObr0Mr/Bm2J2IQfjHzEDekvos+f3ORQWv+ccvxtUgz5dA/wfp/D11Nh/3VtiFIc9lu2pDKmcfwKm30XL11WMj9mUv5AvnLQ5D7S/SCNxVPG9e4fDFW8q+3SX+WJ7CEOpTMJ/G6I=
-    name: nsq-api-0.0.1
-    tag_name: 0.0.1
+    name: nsq-api-0.0.2
+    tag_name: 0.0.2
     on:
       repo: deep-compute/nsq-api
       branch: master

docs/CNAME

@@ -0,0 +1 @@
+deep-compute.github.io.nsq-api

nsq_api/service.py

@@ -11,7 +11,6 @@
 from basescript import BaseScript
 from deeputil import generate_random_string, AttrDict, keeprunning 
 from logagg_utils import NSQSender
-from logagg_utils import InvalidArgument, AuthenticationFailure
 from logagg_utils import start_daemon_thread, log_exception
 
 class NsqAPI(tornado.web.RequestHandler):
@@ -135,8 +134,9 @@ def _parse_master_args(self):
                 elif a[0] == 'secret': master.secret = a[-1]
                 else: raise ValueError
         except ValueError:
-            raise InvalidArgument(self.args.master)
-
+            raise Exception('Invalid Argument', self.args.master)
+        if not master.keys() == ['host', 'port', 'key', 'secret']:
+            raise Exception('Invalid Argument', self.args.master)
         return master
 
 

setup.py

@@ -2,7 +2,7 @@
 from setuptools import find_packages
 setup(
     name="nsq_api",
-    version="0.0.1",
+    version="0.0.2",
     description="API to read logs from NSQ for logagg",
     keywords="nsq-api",
     author="Deep Compute, LLC",
@@ -16,7 +16,7 @@
         "tornado",
         "basescript==0.2.9",
         "nsq-py==0.1.10",
-        "logagg-utils==0.5.0"
+        "logagg-utils==0.5.2"
     ],
     packages=find_packages('.'),
     include_package_data=True,