third-party-mirrors/EDDN
1
0
Fork 0
mirror of https://github.com/EDCD/EDDN.git synced 2025-06-08 03:12:35 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
James Muscat 2015-06-05 14:31:42 +01:00
commit 131b36ac3a
5 changed files with 75 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -53,3 +53,4 @@ docs/_build/
# PyBuilder # PyBuilder
target/ target/
*.prices *.prices
*.prices

3
src/eddn/Monitor.py
View File

@ -189,7 +189,6 @@ class Monitor(Thread):
else: else:
message = message[0] message = message[0]
if Settings.RELAY_DUPLICATE_MAX_MINUTES: if Settings.RELAY_DUPLICATE_MAX_MINUTES:
if duplicateMessages.isDuplicated(message): if duplicateMessages.isDuplicated(message):
schemaID = 'DUPLICATE MESSAGE' schemaID = 'DUPLICATE MESSAGE'
@ -214,7 +213,6 @@ class Monitor(Thread):
c.execute('INSERT OR IGNORE INTO softwares (name, dateStats) VALUES (?, DATE("now", "utc"))', (softwareID, )) c.execute('INSERT OR IGNORE INTO softwares (name, dateStats) VALUES (?, DATE("now", "utc"))', (softwareID, ))
db.commit() db.commit()
# Update uploader count # Update uploader count
uploaderID = json['header']['uploaderID'] uploaderID = json['header']['uploaderID']
@ -224,7 +222,6 @@ class Monitor(Thread):
c.execute('INSERT OR IGNORE INTO uploaders (name, dateStats) VALUES (?, DATE("now", "utc"))', (uploaderID, )) c.execute('INSERT OR IGNORE INTO uploaders (name, dateStats) VALUES (?, DATE("now", "utc"))', (uploaderID, ))
db.commit() db.commit()
# Update schemas count # Update schemas count
schemaID = json['$schemaRef'] schemaID = json['$schemaRef']

3
src/eddn/Relay.py
View File

@ -49,7 +49,7 @@ class Relay(Thread):
receiver = context.socket(zmq.SUB) receiver = context.socket(zmq.SUB)
# Filters on topics or not... # Filters on topics or not...
if Settings.RELAY_RECEIVE_ONLY_GATEWAY_EXTRA_JSON == True: if Settings.RELAY_RECEIVE_ONLY_GATEWAY_EXTRA_JSON is True:
for schemaRef, schemaFile in Settings.GATEWAY_JSON_SCHEMAS.iteritems(): for schemaRef, schemaFile in Settings.GATEWAY_JSON_SCHEMAS.iteritems():
receiver.setsockopt(zmq.SUBSCRIBE, schemaRef) receiver.setsockopt(zmq.SUBSCRIBE, schemaRef)
for schemaRef, schemaFile in Settings.RELAY_EXTRA_JSON_SCHEMAS.iteritems(): for schemaRef, schemaFile in Settings.RELAY_EXTRA_JSON_SCHEMAS.iteritems():
@ -57,7 +57,6 @@ class Relay(Thread):
else: else:
receiver.setsockopt(zmq.SUBSCRIBE, '') receiver.setsockopt(zmq.SUBSCRIBE, '')
for binding in Settings.RELAY_RECEIVER_BINDINGS: for binding in Settings.RELAY_RECEIVER_BINDINGS:
# Relays bind upstream to an Announcer, or another Relay. # Relays bind upstream to an Announcer, or another Relay.
receiver.connect(binding) receiver.connect(binding)

5
src/eddn/_Conf/Settings.py
View File

@ -30,9 +30,7 @@ class _Settings(object):
# If set to false, don't listen to topic and accept all incoming messages # If set to false, don't listen to topic and accept all incoming messages
RELAY_RECEIVE_ONLY_GATEWAY_EXTRA_JSON = True RELAY_RECEIVE_ONLY_GATEWAY_EXTRA_JSON = True
RELAY_EXTRA_JSON_SCHEMAS = { RELAY_EXTRA_JSON_SCHEMAS = {}
}
############################################################################### ###############################################################################
# Gateway settings # Gateway settings
@ -63,7 +61,6 @@ class _Settings(object):
MONITOR_DECOMPRESS_MESSAGES = True MONITOR_DECOMPRESS_MESSAGES = True
def loadFrom(self, fileName): def loadFrom(self, fileName):
f = open(fileName, 'r') f = open(fileName, 'r')
conf = simplejson.load(f) conf = simplejson.load(f)