From 2f7b00a52b304a1db7fbfdfceafbd45217e29e9a Mon Sep 17 00:00:00 2001 From: Tim Laszlo Date: Wed, 10 Oct 2012 08:07:25 -0500 Subject: Reporting: Make transport configurable Add routines to the setup to handle alternate transports. Make the default for new installs LocalFilesystem and existing installs DirectStore. Raise an error is DirectStore is used when loading bcfg-report-collector --- src/lib/Bcfg2/Reporting/Collector.py | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src/lib/Bcfg2/Reporting/Collector.py') diff --git a/src/lib/Bcfg2/Reporting/Collector.py b/src/lib/Bcfg2/Reporting/Collector.py index bb2e85c21..b27a961fd 100644 --- a/src/lib/Bcfg2/Reporting/Collector.py +++ b/src/lib/Bcfg2/Reporting/Collector.py @@ -9,6 +9,7 @@ import threading import Bcfg2.Logger from Bcfg2.Reporting.Transport import load_transport_from_config, \ TransportError, TransportImportError +from Bcfg2.Reporting.Transport.DirectStore import DirectStore from Bcfg2.Reporting.Storage import load_storage_from_config, \ StorageError, StorageImportError @@ -54,6 +55,12 @@ class ReportingCollector(object): traceback.format_exc().splitlines()[-1]) raise ReportingError + if isinstance(self.transport, DirectStore): + self.logger.error("DirectStore cannot be used with the collector. " + "Use LocalFilesystem instead") + self.shutdown() + raise ReportingError + try: self.logger.debug("Validating storage %s" % self.storage.__class__.__name__) -- cgit v1.2.3-1-g7c22