Finishes to convert streamer to new system.

Next to be converted is counter

twiderboard/basic.ini

@@ -16,4 +16,5 @@ name='board.log'
 
 root='/home/jll/Documents/code/twitterboard/'
 basic ="basic.keys"
-oauth ="oauth.keys"
+oauth ="oauth.keys"
+oauth_id=True

twiderboard/command.py

@@ -7,7 +7,7 @@ into commands that will trigger actions on the twiderboard
 import signal
 import sys
 
-from data import engine_url
+import data
 
 from counter import Counter
 from streamer import HashtagLogger
@@ -21,12 +21,12 @@ class Trigger():
         # starting all services
         # Streamer
         print "Starting streamer"
-        self.h = HashtagLogger(engine_url, oauth=True)
+        self.h = HashtagLogger(data.engine_url, oauth=data.oauth)
         self.h.start()
 
         #Counter
         print "Starting counter"
-        self.c = Counter(engine_url)
+        self.c = Counter(data.engine_url)
         self.c.start()
 
         # FIXME: Must create a wrapper to display them all periodically here

twiderboard/data.py

@@ -21,9 +21,10 @@ log_path = os.path.join(root, log_name)
 
 
 # Keys
+oauth=parser.get('keys', 'oauth_id')
 keys_root = parser.get('keys', 'root')
 oauth_name = parser.get('keys', 'oauth')
 basic_name = parser.get('keys', 'basic')
 
 oauth_keys = os.path.join(keys_root, oauth_name)
-basic_keys = os.path.join(keys_root, basic_name)
+basic_keys = os.path.join(keys_root, basic_name)