...

[nodemanager.git] / nm.py

diff --git a/nm.py b/nm.py
index fa527da..b1bce16 100644 (file)
--- a/nm.py
+++ b/nm.py
@@ -3,32 +3,27 @@
 import optparse
 import time
 
-from config import *
 import accounts
 import api
 import database
 import delegate
 import logger
 import plc
-import sliver
+import sliver_vs
 import tools
 
 
 parser = optparse.OptionParser()
-parser.add_option('-d', '--daemon',
-                  action='store_true', dest='daemon', default=False,
-                  help='run daemonized')
-parser.add_option('-s', '--startup',
-                  action='store_true', dest='startup', default=False,
-                  help='run all sliver startup scripts')
+parser.add_option('-d', '--daemon', action='store_true', dest='daemon', default=False, help='run daemonized')
+parser.add_option('-s', '--startup', action='store_true', dest='startup', default=False, help='run all sliver startup scripts')
 (options, args) = parser.parse_args()
 
 def run():
     try:
         if options.daemon: tools.daemon()
 
-        accounts.register_account_type(sliver.Sliver)
-        accounts.register_account_type(delegate.Delegate)
+        accounts.register_class(sliver_vs.Sliver_VS)
+        accounts.register_class(delegate.Delegate)
 
         other_pid = tools.pid_file()
         if other_pid != None: