Fix node synchronization; remove usage stats, it should be standalone project/process

1 files changed, 8 insertions, 25 deletions

diff --git a/sugar-network-node b/sugar-network-node
index 6721337..f35e8ad 100755
--- a/sugar-network-node
+++ b/sugar-network-node
@@ -19,16 +19,14 @@ import os
 import locale
 import gettext
 import logging
-from os.path import exists, join
+from os.path import exists
 
 from gevent import monkey
 
-from sugar_network import db, node, client, toolkit, model
-from sugar_network.node import stats_user, obs, master, slave
-from sugar_network.node import model as master_model
-from sugar_network.node.routes import generate_node_stats
+from sugar_network import db, node, toolkit, model
+from sugar_network.node import obs, master, slave
 from sugar_network.toolkit.http import Connection
-from sugar_network.toolkit.router import Router, Request, Response
+from sugar_network.toolkit.router import Router
 from sugar_network.toolkit import coroutine, application, Option, enforce
 
 
@@ -55,20 +53,16 @@ class Application(application.Daemon):
         if node.certfile.value:
             ssl_args['certfile'] = node.certfile.value
 
-        master_path = join(node.data_root.value, 'master')
-        if exists(master_path):
-            with file(master_path) as f:
-                node_key = f.read().strip()
+        if node.master_mode.value:
             node_class = master.MasterRoutes
-            resources = master_model.RESOURCES
-            logging.info('Start %s node in master mode', node_key)
+            resources = master.RESOURCES
+            logging.info('Start master node')
         else:
-            node_key = join(node.data_root.value, 'node.key')
             node_class = slave.SlaveRoutes
             resources = model.RESOURCES
             logging.info('Start slave node')
         volume = db.Volume(node.data_root.value, resources)
-        cp = node_class(node_key, volume, find_limit=node.find_limit.value)
+        cp = node_class(volume=volume, find_limit=node.find_limit.value)
         self.jobs.spawn(volume.populate)
 
         logging.info('Listening for requests on %s:%s',
@@ -81,7 +75,6 @@ class Application(application.Daemon):
         try:
             self.jobs.join()
         finally:
-            cp.close()
             volume.close()
 
     def shutdown(self):
@@ -102,14 +95,6 @@ class Application(application.Daemon):
         path = self.args.pop(0)
         self._ensure_instance().post(cmd='offline-sync', path=path)
 
-    @application.command(
-            're-generate node statistics', name='restat')
-    def restat(self):
-        enforce(not self.check_for_instance(), 'Shutdown the server at first')
-        volume = db.Volume(node.data_root.value, model.RESOURCES)
-        volume.populate()
-        generate_node_stats(volume, join(node.stats_root.value, 'node'))
-
     def _ensure_instance(self):
         enforce(self.check_for_instance(), 'Node is not started')
         return Connection('http://localhost:%s' %
@@ -126,9 +111,7 @@ locale.setlocale(locale.LC_ALL, '')
 
 Option.seek('main', application)
 Option.seek('main', [toolkit.cachedir])
-Option.seek('client', [client.api_url])
 Option.seek('node', node)
-Option.seek('user-stats', stats_user)
 Option.seek('obs', obs)
 Option.seek('db', db)