Proto v3 #727

Merged
Atheros1 merged 10 commits from ProtoV3 into master 2014-10-17 21:52:36 +02:00
3 changed files with 2 additions and 4 deletions
Showing only changes of commit e096c37f7e - Show all commits

View File

@ -42,8 +42,6 @@ from api import MySimpleXMLRPCRequestHandler
from helper_startup import isOurOperatingSystemLimitedToHavingVeryFewHalfOpenConnections from helper_startup import isOurOperatingSystemLimitedToHavingVeryFewHalfOpenConnections
import shared import shared
import helper_startup
helper_startup.loadConfig()
from helper_sql import sqlQuery from helper_sql import sqlQuery
import threading import threading

View File

@ -20,6 +20,8 @@ import logging
import logging.config import logging.config
import shared import shared
import sys import sys
import helper_startup
helper_startup.loadConfig()
# TODO(xj9): Get from a config file. # TODO(xj9): Get from a config file.
log_level = 'DEBUG' log_level = 'DEBUG'

View File

@ -859,6 +859,4 @@ def _checkAndShareBroadcastWithPeers(data):
shared.objectProcessorQueueSize += len(data) shared.objectProcessorQueueSize += len(data)
objectProcessorQueue.put((objectType,data)) objectProcessorQueue.put((objectType,data))
#helper_startup.loadConfig()
from debug import logger from debug import logger