Revision a544f755 daemons/ganeti-confd
| b/daemons/ganeti-confd | ||
|---|---|---|
| 286 | 286 |
else: |
| 287 | 287 |
reloaded = self.processor.reader.Reload() |
| 288 | 288 |
except errors.ConfigurationError: |
| 289 |
self.DisableConfd() |
|
| 289 |
self.DisableConfd(silent=was_disabled)
|
|
| 290 | 290 |
return |
| 291 | 291 |
|
| 292 | 292 |
if self.polling and reloaded: |
| ... | ... | |
| 311 | 311 |
|
| 312 | 312 |
self._EnableTimer() |
| 313 | 313 |
|
| 314 |
def DisableConfd(self): |
|
| 314 |
def DisableConfd(self, silent=False):
|
|
| 315 | 315 |
"""Puts confd in non-serving mode |
| 316 | 316 |
|
| 317 | 317 |
""" |
| 318 |
logging.warning("Confd is being disabled")
|
|
| 318 |
if not silent: |
|
| 319 |
logging.warning("Confd is being disabled")
|
|
| 319 | 320 |
self.processor.Disable() |
| 320 | 321 |
self.polling = False |
| 321 | 322 |
self._ResetTimer() |
| ... | ... | |
| 350 | 351 |
processor.Enable() |
| 351 | 352 |
except errors.ConfigurationError: |
| 352 | 353 |
# If enabling the processor has failed, we can still go on, but confd will be disabled |
| 354 |
logging.warning("Confd is starting in disabled mode")
|
|
| 353 | 355 |
pass |
| 354 | 356 |
server = ConfdAsyncUDPServer(options.bind_address, options.port, processor) |
| 355 | 357 |
|
Also available in: Unified diff