Changeset 568
- Timestamp:
- 01/01/07 13:28:52 (2 years ago)
- Files:
-
- pycherokeeconf/src/cherokeeconf/config.py (modified) (1 diff)
- pycherokeeconf/src/cherokeeconf/server.py (modified) (8 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
pycherokeeconf/src/cherokeeconf/config.py
r368 r568 163 163 t.write (cfg) 164 164 t.close() 165 166 pycherokeeconf/src/cherokeeconf/server.py
r368 r568 13 13 # Port 14 14 def _get_port (self): 15 tmp = self._conf['server!port'] 16 if tmp: return tmp.value 15 return self.value ('server!port') 17 16 def _set_port (self, port): 18 17 self._conf['server!port'] = ensure_tcp_port(port) … … 24 23 # TLS Port 25 24 def _get_tls_port (self): 26 tmp = self._conf['server!tls_port'] 27 if tmp: return tmp.value 25 return self.value ('server!tls_port') 28 26 def _set_tls_port (self, port): 29 27 self._conf['server!tls_port'] = ensure_tcp_port(port) … … 35 33 # Listen 36 34 def _get_listen (self): 37 tmp = self._conf['server!listen'] 38 if tmp: return tmp.value 35 return self.value ('server!listen') 39 36 def _set_listen (self, ip): 40 37 self._conf['server!listen'] = ensure_ip(ip) … … 46 43 # Keepalive 47 44 def _get_keepalive (self): 48 tmp = self._conf['server!keepalive'] 49 if tmp: return tmp.value 45 return self.value ('server!keepalive') 50 46 def _set_keepalive (self, keep): 51 47 self._conf['server!keepalive'] = ensure_bool(keep) … … 55 51 # PID File 56 52 def _get_pid_file (self): 57 tmp = self._conf['server!pid_file'] 58 if tmp: return tmp.value 53 return self.value ('server!pid_file') 59 54 def _set_pid_file (self, path): 60 55 self._conf['server!pid_file'] = ensure_parent_dir_exists(path) … … 66 61 # Panic Action 67 62 def _get_panic_action (self): 68 tmp = self._conf['server!panic_action'] 69 if tmp: return tmp.value 63 return self.value ('server!panic_action') 70 64 def _set_panic_action (self, file): 71 65 self._conf['server!panic_action'] = ensure_path(file) … … 77 71 # Mime file 78 72 def _get_mime_file (self): 79 tmp = self._conf['server!mime_file'] 80 if tmp: return tmp.value 73 return self.value ('server!mime_file') 81 74 def _set_mime_file (self, file): 82 75 self._conf['server!mime_file'] = ensure_path(file) … … 96 89 self._conf[path] = ConfigNode() 97 90 91 # Misc 92 # 93 def _value (self, o): 94 if not o: 95 return '' 96 else: 97 return o.value 98 99 def value (self, key): 100 return self._value (self._conf[key]) 101 98 102 def save (self): 99 103 self._conf.save()