Merge branch 'development'
This commit is contained in:
commit
8bb757c2e9
2 changed files with 2 additions and 5 deletions
1
log.py
1
log.py
|
@ -23,7 +23,6 @@
|
||||||
# SOFTWARE.
|
# SOFTWARE.
|
||||||
|
|
||||||
import pyodbc
|
import pyodbc
|
||||||
import mysql.connector
|
|
||||||
import time
|
import time
|
||||||
from odbcReferences import driver
|
from odbcReferences import driver
|
||||||
from config import logRetentionDays, maximumSQLAttempts, loggingMode
|
from config import logRetentionDays, maximumSQLAttempts, loggingMode
|
||||||
|
|
|
@ -24,8 +24,6 @@
|
||||||
|
|
||||||
import config
|
import config
|
||||||
|
|
||||||
if config.loggingMode == 'rabbitmq':
|
|
||||||
|
|
||||||
import rabbitmq
|
import rabbitmq
|
||||||
rabbitmq = rabbitmq.rabbitMQClient(config.rabbitmqca,config.rabbitmqcacert,config.rabbitmqcakey,config.rabbitmqHost,config.rabbitmqPort,config.rabbitmqRoutingKey)
|
rabbitmq = rabbitmq.rabbitMQClient(config.rabbitmqca,config.rabbitmqcacert,config.rabbitmqcakey,config.rabbitmqHost,config.rabbitmqPort,config.rabbitmqRoutingKey)
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue