From 7eff622e13b4a178f0adbc2a75be97eb9e3d8336 Mon Sep 17 00:00:00 2001
From: Maurizio Porrato <maurizio.porrato@gmail.com>
Date: Sat, 9 Apr 2011 17:20:29 +0200
Subject: [PATCH] server: switched to gnuradionetwork system manager by default

---
 frn/protocol/server.py       | 4 ++--
 manager.py                   | 5 +++--
 twisted/plugins/frnserver.py | 3 ++-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/frn/protocol/server.py b/frn/protocol/server.py
index a3ab4f5..f5486dc 100644
--- a/frn/protocol/server.py
+++ b/frn/protocol/server.py
@@ -112,10 +112,10 @@ class FRNServer(BufferingLineReceiver, TimeoutMixin):
         self.stopPinging()
         if self.user is not None:
             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.tracker.logout(self)
-        if self.factory.talking.get(self.user.NT) == self:
-            del self.factory.talking[self.user.NT]
         self.transport.loseConnection()
 
     def decodeCT(self, body):
diff --git a/manager.py b/manager.py
index c84b4ff..e2be055 100755
--- a/manager.py
+++ b/manager.py
@@ -26,10 +26,11 @@ if __name__ == '__main__':
 		log.msg("Building RemoteManager")
 		return RemoteManager(reactor)
 
+    pool = ConnectionPool("sqlite3", "/dev/shm/frnmanager.sqlite3", check_same_thread=False, cp_noisy=True)
+
 	def databaseManagerFactory():
 		log.msg("Building DatabaseManager")
-		return DatabaseManager(
-			ConnectionPool("sqlite3", "/tmp/frnmanager.sqlite3", check_same_thread=False, cp_noisy=True))
+		return DatabaseManager(pool)
 
 	reactor.listenTCP(10025, FRNManagerServerFactory(
 		databaseManagerFactory
diff --git a/twisted/plugins/frnserver.py b/twisted/plugins/frnserver.py
index 1496a7a..1b332ca 100755
--- a/twisted/plugins/frnserver.py
+++ b/twisted/plugins/frnserver.py
@@ -52,7 +52,8 @@ class FRNServerServiceMaker(object):
         return internet.TCPServer(options['port'],
             FRNServerFactory(
                 pjoin(options['confdir'], 'tracker.shelve'),
-                RemoteManager(),
+#                RemoteManager(), # Authenticate on frn.no-ip.info
+                RemoteManager(server='fri.no-ip.info', maskParrot=False),
                 FRNUser(
                     SN=options['server'],PT=options['port'],
                     BN=options['backup_server'], BP=options['backup_port'],