Consolidating services to use just one port, removed syslog logging since we have anamon

2 files changed, 10 insertions, 11 deletions

diff --git a/scripts/cobblerd b/scripts/cobblerd
index a9e7312d..358d7b61 100755
--- a/scripts/cobblerd
+++ b/scripts/cobblerd
@@ -21,12 +21,13 @@ import cobbler.cobblerd as app
 import logging
 import cobbler.utils as utils
 import cobbler.sub_process as sub_process
+import traceback
 
 import optparse
 
-def daemonize_self(logger):
+def daemonize_self():
     # daemonizing code:  http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/66012
-    logger.info("cobblerd started")
+    # logger.info("cobblerd started")
     try: 
         pid = os.fork() 
         if pid > 0:
@@ -34,7 +35,7 @@ def daemonize_self(logger):
             sys.exit(0) 
     except OSError, e: 
         print >>sys.stderr, "fork #1 failed: %d (%s)" % (e.errno, e.strerror) 
-        utils.log_exc(logger)
+        #utils.log_exc(logger)
         sys.exit(1)
 
     # decouple from parent environment
@@ -50,7 +51,7 @@ def daemonize_self(logger):
             sys.exit(0) 
     except OSError, e: 
         print >>sys.stderr, "fork #2 failed: %d (%s)" % (e.errno, e.strerror) 
-        utils.log_exc(logger)
+        #utils.log_exc(logger)
         sys.exit(1) 
 
     dev_null = file('/dev/null','rw') 
@@ -80,16 +81,14 @@ def main():
         if not isinstance(log_level, int):
             op.error('Unrecognized log level %r given')
         log_settings['log_level'] = log_level
-    api = bootapi.BootAPI(log_settings=log_settings, is_cobblerd=True)
-    logger = api.logger
 
     if options.daemonize:
-        daemonize_self(logger)
+        daemonize_self()
 
     try:
-        app.core(logger=logger)
+        app.core()
     except:
-        utils.log_exc(logger)
+        traceback.print_exc()
 
 if __name__ == "__main__":
     main()
diff --git a/scripts/index.py b/scripts/index.py
index 26b86f36..bf3b17c9 100755
--- a/scripts/index.py
+++ b/scripts/index.py
@@ -23,7 +23,7 @@ from cobbler.webui import CobblerWeb
 import cobbler.utils as utils
 import cobbler.yaml as yaml
 
-XMLRPC_SERVER = "http://127.0.0.1:25152" # was http://127.0.0.1/cobbler_api_rw"
+XMLRPC_SERVER = "http://127.0.0.1:25151" # FIXME: pull port from settings
 
 #=======================================
 
@@ -110,7 +110,7 @@ def handler(req):
     data = fd.read()
     fd.close()
     ydata = yaml.load(data).next()
-    remote_port = ydata.get("xmlrpc_rw_port", 25152)
+    remote_port = ydata.get("xmlrpc_port", 25151)
 
     mode = form.get('mode','index')