server: switched to gnuradionetwork system manager by default
This commit is contained in:
parent
e438cde9d2
commit
7eff622e13
|
@ -112,10 +112,10 @@ class FRNServer(BufferingLineReceiver, TimeoutMixin):
|
||||||
self.stopPinging()
|
self.stopPinging()
|
||||||
if self.user is not None:
|
if self.user is not None:
|
||||||
log.msg("Logging out client %s" % self.user)
|
log.msg("Logging out client %s" % self.user)
|
||||||
|
if self.factory.talking.get(self.user.NT) == self:
|
||||||
|
del self.factory.talking[self.user.NT]
|
||||||
self.factory.manager.clientLogout(self.factory.serverAuth, self.user)
|
self.factory.manager.clientLogout(self.factory.serverAuth, self.user)
|
||||||
self.factory.tracker.logout(self)
|
self.factory.tracker.logout(self)
|
||||||
if self.factory.talking.get(self.user.NT) == self:
|
|
||||||
del self.factory.talking[self.user.NT]
|
|
||||||
self.transport.loseConnection()
|
self.transport.loseConnection()
|
||||||
|
|
||||||
def decodeCT(self, body):
|
def decodeCT(self, body):
|
||||||
|
|
|
@ -26,10 +26,11 @@ if __name__ == '__main__':
|
||||||
log.msg("Building RemoteManager")
|
log.msg("Building RemoteManager")
|
||||||
return RemoteManager(reactor)
|
return RemoteManager(reactor)
|
||||||
|
|
||||||
|
pool = ConnectionPool("sqlite3", "/dev/shm/frnmanager.sqlite3", check_same_thread=False, cp_noisy=True)
|
||||||
|
|
||||||
def databaseManagerFactory():
|
def databaseManagerFactory():
|
||||||
log.msg("Building DatabaseManager")
|
log.msg("Building DatabaseManager")
|
||||||
return DatabaseManager(
|
return DatabaseManager(pool)
|
||||||
ConnectionPool("sqlite3", "/tmp/frnmanager.sqlite3", check_same_thread=False, cp_noisy=True))
|
|
||||||
|
|
||||||
reactor.listenTCP(10025, FRNManagerServerFactory(
|
reactor.listenTCP(10025, FRNManagerServerFactory(
|
||||||
databaseManagerFactory
|
databaseManagerFactory
|
||||||
|
|
|
@ -52,7 +52,8 @@ class FRNServerServiceMaker(object):
|
||||||
return internet.TCPServer(options['port'],
|
return internet.TCPServer(options['port'],
|
||||||
FRNServerFactory(
|
FRNServerFactory(
|
||||||
pjoin(options['confdir'], 'tracker.shelve'),
|
pjoin(options['confdir'], 'tracker.shelve'),
|
||||||
RemoteManager(),
|
# RemoteManager(), # Authenticate on frn.no-ip.info
|
||||||
|
RemoteManager(server='fri.no-ip.info', maskParrot=False),
|
||||||
FRNUser(
|
FRNUser(
|
||||||
SN=options['server'],PT=options['port'],
|
SN=options['server'],PT=options['port'],
|
||||||
BN=options['backup_server'], BP=options['backup_port'],
|
BN=options['backup_server'], BP=options['backup_port'],
|
||||||
|
|
Loading…
Reference in New Issue