diff --git a/conjurer_librarian/conjurer_librarian.py b/conjurer_librarian/conjurer_librarian.py index 9098cf6..1a322ab 100644 --- a/conjurer_librarian/conjurer_librarian.py +++ b/conjurer_librarian/conjurer_librarian.py @@ -41,7 +41,6 @@ class Librarian(object): self.hit = 0 self.total = 0 self.app = app - self.logger = app.logger self.live_results = [] self.final_result = [] self.not_in_db = [] @@ -54,15 +53,15 @@ class Librarian(object): self.search_result_from_cr.update(result) self.total = result['message']['total-results'] self.fetched += len(result['message']['items']) - self.logger.info (self.total) - self.logger.info(self.fetched) + self.app.logger.info (self.total) + self.app.logger.info(self.fetched) while self.total > self.fetched and self.limit > self.fetched: result = self.cr.works(query = query, limit = 1000) self.search_result_from_cr.update(result) self.total = result['message']['total-results'] self.fetched += len(result['message']['items']) - self.logger.info (self.total) - self.logger.info(self.fetched) + self.app.logger.info (self.total) + self.app.logger.info(self.fetched) time.sleep(0.1) self.app.logger.info("CROSSREF DONE") #TODO: add to sql with UUID @@ -131,8 +130,8 @@ class Librarian(object): temp = [] refined_result = [] for key in unrefined_reqult: - self.logger.info("KEY:") - self.logger.info(key) + self.app.logger.info("KEY:") + self.app.logger.info(key) for item in unrefined_reqult[self.uuid]["summary"]: if item["container"] == "NO" and item["title"]: @@ -155,7 +154,7 @@ class Librarian(object): #TODO: DOłożyć sprawdzenie czy w rafinowanym pliku już nie mamy częściowego wyniku tutaj bo zanim w ogóle otworzymy nierafinowany #Search sql for UUID #SQL SELECT * FROM RESULTS WHERE UUID = uuid - self.logger.info(f"Search started {self.uuid}") + self.app.logger.info(f"Search started {self.uuid}") database = None query = self.query with open("cr_results.json", "r+", encoding="utf-8") as cr_file: @@ -313,23 +312,22 @@ async def get_partial(): #=======================================MAIN=================================================== if __name__ == "__main__": - logger = app.logger - logger.setLevel(logging.DEBUG) + app.logger.setLevel(logging.DEBUG) threads = [] threads.append(threading.Thread(target=waitress_run)) #threads.append(threading.Thread(target=flask_debug)) bgtask = BackgroundTaskSearch() bgtask.app = app threads.append(bgtask) - threads.append(threading.Thread(target = scrape_bot.scraper, args=(logger,))) + threads.append(threading.Thread(target = scrape_bot.scraper, args=(app.logger,))) i = 0 for worker in threads: try: - logger.info(f"App number: {i}") + app.logger.info(f"App number: {i}") i+=1 worker.start() except RuntimeError as e: - logger.error("Exploded") + app.logger.error("Exploded") print(str(e)) for worker in threads: worker.join()