Database and logging fixes

This commit is contained in:
Felipe M 2021-02-02 12:55:17 +01:00
parent e5478713d8
commit 8e7c6eedba
Signed by: fmartingr
GPG key ID: 716BC147715E716F
6 changed files with 5 additions and 9 deletions

View file

@ -52,7 +52,6 @@ def load_logged_in_user():
@login_required @login_required
def index_view(): def index_view():
if not session.get("logged_in", False): if not session.get("logged_in", False):
logger.info(url_for("admin.login_view"))
return redirect(url_for("admin.login_view")) return redirect(url_for("admin.login_view"))
return redirect(url_for("admin.channel_list_view")) return redirect(url_for("admin.channel_list_view"))
@ -92,7 +91,6 @@ def plugin_list_view():
@admin.route("/channels") @admin.route("/channels")
@login_required @login_required
def channel_list_view(): def channel_list_view():
channels = ChannelQuery.all()
return render_template("channel_list.j2", channels=ChannelQuery.all()) return render_template("channel_list.j2", channels=ChannelQuery.all())
@ -148,6 +146,6 @@ def channel_plugin_detail_view(channel_plugin_id):
@admin.route("/channelplugins/<channel_plugin_id>/delete", methods=["POST"]) @admin.route("/channelplugins/<channel_plugin_id>/delete", methods=["POST"])
@login_required @login_required
def channel_plugin_delete_view(channel_plugin_id): def channel_plugin_delete_view(channel_plugin_id):
ChannelPluginQuery.delete(channel_plugin_id=channel_plugin_id) ChannelPluginQuery.delete(channel_plugin_id)
flash("Plugin removed", category="success") flash("Plugin removed", category="success")
return redirect(request.headers.get("Referer")) return redirect(request.headers.get("Referer"))

View file

@ -41,6 +41,7 @@ def incoming_platform_message_view(platform, path=None):
return {} return {}
@app.route("/healthz") @app.route("/healthz")
def healthz(): def healthz():
return {} return {}

View file

@ -1,5 +1,4 @@
import hashlib import hashlib
import os
from typing import Union from typing import Union
import dataset import dataset
@ -158,4 +157,5 @@ class ChannelPluginQuery(Query):
@classmethod @classmethod
def delete_by_channel(cls, channel_id): def delete_by_channel(cls, channel_id):
cls.delete(channel_id=channel_id) channel_plugins = cls.get_from_channel_id(channel_id)
[cls.delete(item.id) for item in channel_plugins]

View file

@ -28,7 +28,7 @@ class Channel:
def has_enabled_plugin(self, plugin_id): def has_enabled_plugin(self, plugin_id):
if plugin_id not in self.plugins: if plugin_id not in self.plugins:
logger.info("No enabled!", plugin_id=plugin_id, plugins=self.plugins) logger.debug("No enabled!", plugin_id=plugin_id, plugins=self.plugins)
return False return False
return self.plugins[plugin_id].enabled return self.plugins[plugin_id].enabled

View file

@ -64,5 +64,4 @@ def get_available_plugins():
module=ep.module_name, module=ep.module_name,
) )
logger.info("Plugins loaded", plugins=list(plugins.keys()))
return plugins return plugins

View file

@ -29,8 +29,6 @@ def handle_message(platform: str, request: dict):
) )
return return
logger.info("Received request", platform=platform, message=message)
if not message or message.from_bot: if not message or message.from_bot:
return return