Merge pull request #27 from pandemicsyn/dev

Merge for v1 release

Author: Florian Hines

.gitignore

@@ -34,4 +34,5 @@ nosetests.xml
 .mr.developer.cfg
 .project
 .pydevproject
-*.ignore-me
+*.ignore-me
+*.DS_Store

stalker/__init__.py

@@ -2,7 +2,7 @@
 
 
 #: Version information (major, minor, revision[, 'dev']).
-version_info = (0, 0, 24)
+version_info = (1, 0, 0)
 #: Version string 'major.minor.revision'.
 version = __version__ = ".".join(map(str, version_info))
 gettext.install('stalker')

stalker/stalker_agent.py

@@ -1,6 +1,7 @@
 import os
 import json
-from eventlet import wsgi
+from random import randint
+from eventlet import wsgi, sleep
 from eventlet.green import subprocess, urllib2
 from socket import gethostname
 import eventlet
@@ -110,6 +111,7 @@ def notify_master(self):
         req = urllib2.Request(target, data,
                               {'Content-Type': 'application/json'})
         req.add_header("X-REGISTER-KEY", self.register_key)
+        sleep(randint(1, 30))
         try:
             r = urllib2.urlopen(req)
             headers = r.info().dict

stalkerweb/__init__.py

@@ -34,6 +34,8 @@ def _init_redis(app):
 app.config['THEMES'] = ['cosmo', 'cerulean', 'cyborg', 'slate', 'spacelab',
                         'united', 'flatly']
 app.config['CACHE_TTL'] = 10
+app.config['GRAPHITE_ENABLE'] = False
+app.config['GRAPHITE_HOST'] = 'http://localhost/'
 
 
 app.config.from_envvar('STALKERWEB_CONFIG')