PR#643: Various fixes - fm-orchestrator

Filip Valder • 6 years ago

6a2e9ae

Filip Valder • 6 years ago

1775d33

module_build_service/__init__.py

file modified

+7 -7

		`@@ -54,10 +54,14 @@`
		`from module_build_service.proxy import ReverseProxy`


		`- def create_app(debug=False, verbose=False, quiet=False):`
		`- app = Flask(__name__)`
		`- app.wsgi_app = ReverseProxy(app.wsgi_app)`
		`+ app = Flask(__name__)`
		`+ app.wsgi_app = ReverseProxy(app.wsgi_app)`
		`+`
		`+ conf = init_config(app)`
		`+ db = SQLAlchemy(app)`
		`+`

		`+ def create_app(debug=False, verbose=False, quiet=False):`
		`# logging (intended for flask-script, see manage.py)`
		`log = getLogger(__name__)`
		`if debug:`
		`@@ -69,10 +73,6 @@`

		`return app`

		`- app = create_app()`
		`- conf = init_config(app)`
		`- db = SQLAlchemy(app)`
		`-`

		`def load_views():`
		`from module_build_service import views`

file modified

+24

		`@@ -28,6 +28,7 @@`
		`import kobo.rpmlib`
		`import modulemd`
		`import pipes`
		`+ import re`
		`import threading`

		`from module_build_service import conf, log`
		`@@ -324,6 +325,25 @@`
		`if os.path.exists(old_log):`
		`os.rename(old_log, new_log)`

		`+ def _purge_useless_logs(self):`
		`+ """`
		`+ Remove empty or otherwise useless log files`
		`+ """`
		`+ for logf in os.listdir(self.resultsdir):`
		`+`
		`+ log_path = os.path.join(self.resultsdir, logf)`
		`+`
		`+ # Remove empty files`
		`+ if os.path.isfile(log_path) and os.path.getsize(log_path) == 0:`
		`+ os.remove(log_path)`
		`+`
		`+ # Remove other files containing useless information`
		`+ elif logf.endswith('-srpm-stdout.log'):`
		`+ with open(log_path) as f:`
		`+ data = f.read(4096)`
		`+ if re.match("Downloading [^\n]*\n\n\nWrote: [^\n]", data):`
		`+ os.remove(log_path)`
		`+`
		`def build_srpm(self, artifact_name, source, build_id, builder):`
		`"""`
		`Builds the artifact from the SRPM.`
		`@@ -386,6 +406,10 @@`
		`for name in os.listdir(resultsdir):`
		`os.rename(os.path.join(resultsdir, name), os.path.join(self.resultsdir, name))`

		`+ # Depending on the configuration settings, remove/keep useless log files`
		`+ if conf.mock_purge_useless_logs:`
		`+ self._purge_useless_logs()`
		`+`
		`# We return BUILDING state here even when we know it is already`
		`# completed or failed, because otherwise utils.start_build_batch`
		`# would think this component is already built and also tagged, but`

module_build_service/config.py

file modified

		`@@ -322,6 +322,10 @@`
		`'type': Path,`
		`'default': '~/modulebuild/builds',`
		`'desc': 'Directory for Mock build results.'},`
		`+ 'mock_purge_useless_logs': {`
		`+ 'type': bool,`
		`+ 'default': True,`
		`+ 'desc': 'Remove empty or otherwise useless log files.'},`
		`'scmurls': {`
		`'type': list,`
		`'default': [],`