File tree 5 files changed +48
-4
lines changed
5 files changed +48
-4
lines changed Original file line number Diff line number Diff line change
1
+ [main]
2
+ server=localhost:1055
3
+ username=
Original file line number Diff line number Diff line change
1
+
2
+ import designpatterns
3
+
4
+ class ClientConfiguration (designpatterns .Borg ):
5
+
6
+ CLIENT_CONFIG_NAME = 'client.conf'
7
+
8
+ def __init__ (self ):
9
+ if not 'server' in self .__dict__ :
10
+ import ConfigParser
11
+ config = ConfigParser .ConfigParser ()
12
+ config .read (ClientConfiguration .CLIENT_CONFIG_NAME )
13
+ self .server = config .get ('main' , 'server' )
14
+ self .username = config .get ('main' , 'username' )
15
+
16
+ def getServer (self ):
17
+ return self .server
18
+
19
+ def getUsername (self ):
20
+ return self .username
21
+
22
+
23
+ class ServerConfiguration (designpatterns .Borg ):
24
+
25
+ SERVER_CONFIG_NAME = 'server.conf'
26
+
27
+ def __init__ (self ):
28
+ if not 'port' in self .__dict__ :
29
+ import ConfigParser
30
+ config = ConfigParser .ConfigParser ()
31
+ config .read (ServerConfiguration .SERVER_CONFIG_NAME )
32
+ self .port = config .getint ('main' , 'port' )
33
+
34
+ def getPort (self ):
35
+ return self .port
36
+
Original file line number Diff line number Diff line change 4
4
from twisted .web import server
5
5
from twisted .python import log
6
6
7
- from consider import rpcservice , storage
7
+ from consider import rpcservice , storage , configuration
8
8
9
9
class MasterService (service .MultiService ):
10
10
def __init__ (self ):
11
11
service .MultiService .__init__ (self )
12
-
13
- self .rpcServerPort = 1055
12
+ serverConfig = configuration . ServerConfiguration ()
13
+ self .rpcServerPort = serverConfig . getPort ()
14
14
self .monitorService = MonitorService ()
15
15
self .rpcServer = internet .TCPServer (
16
16
self .rpcServerPort ,
Original file line number Diff line number Diff line change @@ -41,9 +41,12 @@ class Settings(designpatterns.Borg):
41
41
def __init__ (self ):
42
42
# load state when the state of the first borg is initialized
43
43
if 'username' not in self .__dict__ :
44
+ from consider .configuration import ClientConfiguration
45
+ clientConfiguration = ClientConfiguration ()
44
46
self .username = 'test'
45
47
self .password = 'test'
46
- self .serverAddress = 'http://localhost:1055'
48
+ self .serverAddress = 'http://' + clientConfiguration .getServer ()
49
+ print ('Connecting to server: ' + self .serverAddress )
47
50
self .observers = []
48
51
self .webPageList = []
49
52
Original file line number Diff line number Diff line change
1
+ [main]
2
+ port=1055
You can’t perform that action at this time.
0 commit comments