X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fserver%2Fsfa-start.py;h=4f72b6784384bbcba56a7871162b6f1c1062db5a;hb=d40b9aa4b75edb62273b2d0705945342468d69d6;hp=da6eba475284c27cce955a93ad533ae5fbaa8f9f;hpb=326dac098af10c8fccb8fd3243792d6a9147597a;p=sfa.git diff --git a/sfa/server/sfa-start.py b/sfa/server/sfa-start.py index da6eba47..4f72b678 100755 --- a/sfa/server/sfa-start.py +++ b/sfa/server/sfa-start.py @@ -39,7 +39,6 @@ from optparse import OptionParser from sfa.util.sfalogging import logger from sfa.util.xrn import get_authority, hrn_to_urn from sfa.util.config import Config -import sfa.client.xmlrpcprotocol as xmlrpcprotocol from sfa.trust.gid import GID from sfa.trust.trustedroots import TrustedRoots from sfa.trust.certificate import Keypair, Certificate @@ -61,7 +60,10 @@ def daemon(): devnull = os.open(os.devnull, os.O_RDWR) os.dup2(devnull, 0) # xxx fixme - this is just to make sure that nothing gets stupidly lost - should use devnull - crashlog = os.open('/var/log/httpd/sfa_access_log', os.O_RDWR | os.O_APPEND | os.O_CREAT, 0644) + logdir='/var/log/httpd' + # when installed in standalone we might not have httpd installed + if not os.path.isdir(logdir): os.mkdir('/var/log/httpd') + crashlog = os.open('%s/sfa_access_log'%logdir, os.O_RDWR | os.O_APPEND | os.O_CREAT, 0644) os.dup2(crashlog, 1) os.dup2(crashlog, 2) @@ -133,8 +135,8 @@ def update_cert_records(gids): Removes old records from the db. """ # import SfaTable here so this module can be loaded by PlcComponentApi - from sfa.util.table import SfaTable - from sfa.util.record import SfaRecord + from sfa.storage.table import SfaTable + from sfa.storage.record import SfaRecord if not gids: return table = SfaTable()