Skip to content
Snippets Groups Projects
Unverified Commit d9fc52bf authored by Dashie's avatar Dashie
Browse files

py3: singleton fixes

parent 9360158a
No related branches found
No related tags found
No related merge requests found
......@@ -2,13 +2,12 @@ import sys
import os.path
import logging
import logging.handlers
import psycopg2.extras
import datetime
import time
import trackdirect
from trackdirect.database.DatabaseConnection import DatabaseConnection
from trackdirect.database.DatabaseObjectFinder import DatabaseObjectFinder
from trackdirect.TrackDirectConfig import TrackDirectConfig
from trackdirect.repositories.PacketRepository import PacketRepository
if __name__ == '__main__':
......@@ -26,7 +25,7 @@ if __name__ == '__main__':
print("\n" + sys.argv[0] + ' [config.ini]')
sys.exit()
config = TrackDirectConfig()
config = trackdirect.TrackDirectConfig()
config.populate(sys.argv[1])
maxDaysToSavePositionData = int(config.daysToSavePositionData)
......
......@@ -4,10 +4,10 @@ import logging
import logging.handlers
import datetime
import time
import trackdirect
from trackdirect.database.DatabaseConnection import DatabaseConnection
from trackdirect.database.DatabaseObjectFinder import DatabaseObjectFinder
from trackdirect.TrackDirectConfig import TrackDirectConfig
if __name__ == '__main__':
......@@ -26,7 +26,7 @@ if __name__ == '__main__':
stationId = sys.argv[2]
config = TrackDirectConfig()
config = trackdirect.TrackDirectConfig()
config.populate(sys.argv[1])
try:
......
import logging
from twisted.python import log
from twisted.internet import threads, reactor, task
from twisted.internet.error import AlreadyCancelled, AlreadyCalled
from autobahn.twisted.websocket import WebSocketServerProtocol
import json
import datetime
import time
import psycopg2
import psycopg2.extras
import os
import re
from trackdirect.TrackDirectConfig import TrackDirectConfig
import trackdirect
from trackdirect.database.DatabaseConnection import DatabaseConnection
from trackdirect.websocket.WebsocketResponseCreator import WebsocketResponseCreator
......@@ -35,7 +30,7 @@ class TrackDirectWebsocketServer(WebSocketServerProtocol):
WebSocketServerProtocol.__init__(self)
self.logger = logging.getLogger('trackdirect')
self.config = TrackDirectConfig()
self.config = trackdirect.TrackDirectConfig()
self.maxClientIdleTime = int(self.config.maxClientIdleTime) * 60
self.maxQueuedRealtimePackets = int(
self.config.maxQueuedRealtimePackets)
......
import datetime, time
from math import floor, ceil
import time
import trackdirect
from math import ceil
from trackdirect.parser.policies.MapSectorPolicy import MapSectorPolicy
from trackdirect.TrackDirectConfig import TrackDirectConfig
class WebsocketConnectionState():
"""An WebsocketConnectionState instance contains information about the current state of a websocket connection
......@@ -15,7 +15,7 @@ class WebsocketConnectionState():
self.latestRequestTimestamp = 0
self.latestRequestId = 0
self.latestHandledRequestId = 0
self.config = TrackDirectConfig()
self.config = trackdirect.TrackDirectConfig()
self.noRealTime = False
self.disconnected = False
......
import logging
from twisted.python import log
import psycopg2, psycopg2.extras
import json
from math import floor, ceil
import datetime, time
import time
import aprslib
from trackdirect.parser.AprsPacketParser import AprsPacketParser
from trackdirect.parser.policies.StationNameFormatPolicy import StationNameFormatPolicy
from trackdirect.objects.Packet import Packet
from trackdirect.objects.Station import Station
from trackdirect.objects.Sender import Sender
from trackdirect.TrackDirectConfig import TrackDirectConfig
import trackdirect
from trackdirect.exceptions.TrackDirectParseError import TrackDirectParseError
......@@ -39,7 +31,7 @@ class AprsISPayloadCreator():
self.db = db
self.responseDataConverter = ResponseDataConverter(state, db)
self.historyResponseCreator = HistoryResponseCreator(state, db)
self.config = TrackDirectConfig()
self.config = trackdirect.TrackDirectConfig()
self.stationHashTimestamps = {}
self.saveOgnStationsWithMissingIdentity = False
......
import logging
from twisted.python import log
import trackdirect
import re
import datetime, time
import aprslib
from trackdirect.TrackDirectConfig import TrackDirectConfig
from trackdirect.parser.AprsISConnection import AprsISConnection
from trackdirect.repositories.SenderRepository import SenderRepository
from trackdirect.exceptions.TrackDirectParseError import TrackDirectParseError
class AprsISReader():
"""The AprsISReader class will connect to a APRS-IS server and listen for APRS-packets
......@@ -31,7 +25,7 @@ class AprsISReader():
self.aprsISConnection2 = None
self.logger = logging.getLogger('trackdirect')
self.config = TrackDirectConfig()
self.config = trackdirect.TrackDirectConfig()
def start(self):
......
import logging
from twisted.python import log
from math import floor, ceil
import datetime, time
import time
import psycopg2, psycopg2.extras
import trackdirect
from trackdirect.repositories.PacketRepository import PacketRepository
from trackdirect.repositories.StationRepository import StationRepository
......@@ -12,7 +11,6 @@ from trackdirect.repositories.StationRepository import StationRepository
from trackdirect.websocket.queries.MostRecentPacketsQuery import MostRecentPacketsQuery
from trackdirect.websocket.responses.ResponseDataConverter import ResponseDataConverter
from trackdirect.TrackDirectConfig import TrackDirectConfig
class FilterResponseCreator():
"""The FilterResponseCreator is used to create filter responses, a response sent to client when client wants to filter on a station
......@@ -32,7 +30,7 @@ class FilterResponseCreator():
self.responseDataConverter = ResponseDataConverter(state, db)
self.packetRepository = PacketRepository(db)
self.stationRepository = StationRepository(db)
self.config = TrackDirectConfig()
self.config = trackdirect.TrackDirectConfig()
def getResponses(self, request) :
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment