more merges from gerrit

Change-Id: I13441cd8889dd39f74a2dd1a85e75a1b76bb93c8

bin/secop-server

@@ -30,8 +30,8 @@ from os import path
 # Add import path for inplace usage
 sys.path.insert(0, path.abspath(path.join(path.dirname(__file__), '..')))
 
-from secop.lib import getGeneralConfig
-from secop.logging import initLogging
+from secop.lib import generalConfig
+from secop.logging import logger
 from secop.server import Server
 
 
@@ -75,6 +75,11 @@ def parseArgv(argv):
                         action='store_true',
                         help='check cfg files only',
                         default=False)
+    parser.add_argument('-r',
+                        '--relaxed',
+                        action='store_true',
+                        help='no checking of problematic behaviour',
+                        default=False)
     return parser.parse_args(argv)
 
 
@@ -85,9 +90,15 @@ def main(argv=None):
     args = parseArgv(argv[1:])
 
     loglevel = 'debug' if args.verbose else ('error' if args.quiet else 'info')
-    getGeneralConfig(args.gencfg)
-    log = initLogging(loglevel)
-    srv = Server(args.name, log, cfgfiles=args.cfgfiles, interface=args.port, testonly=args.test)
+    if args.relaxed:
+        generalConfig.defaults['lazy_number_validation'] = True
+        generalConfig.defaults['disable_value_range_check'] = True
+        generalConfig.defaults['legacy_hasiodev'] = True
+        generalConfig.defaults['tolerate_poll_property'] = True
+    generalConfig.init(args.gencfg)
+    logger.init(loglevel)
+
+    srv = Server(args.name, logger.log, cfgfiles=args.cfgfiles, interface=args.port, testonly=args.test)
 
     if args.daemonize:
         srv.start()