Improve logging

2025-11-10 19:46:22 +00:00 · 2022-06-07 19:19:14 +02:00
10 changed files with 19 additions and 125 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -21,7 +21,7 @@ Steps to reproduce the behavior:
 3. Scroll down to '....'
 4. See error

-! ALWAYS INCLUDE AN EXAMPLE URL WHERE IT IS POSSIBLE TO RE-CREATE THE ISSUE - USE THE 'SHARE WATCH' FEATURE AND PASTE IN THE SHARE-LINK!
+! ALWAYS INCLUDE AN EXAMPLE URL WHERE IT IS POSSIBLE TO RE-CREATE THE ISSUE !

 **Expected behavior**
 A clear and concise description of what you expected to happen.
--- a/changedetectionio/init.py
+++ b/changedetectionio/init.py
@@ -352,8 +352,9 @@ def changedetection_app(config=None, datastore_o=None):
                latest_fname = watch.history[dates[-1]]

                html_diff = diff.render_diff(prev_fname, latest_fname, include_equal=False, line_feed_sep="</br>")
-                fe.content(content="<html><body><h4>{}</h4>{}</body></html>".format(watch_title, html_diff),
-                           type='CDATA')
+                fe.description(description="<![CDATA["
+                                           "<html><body><h4>{}</h4>{}</body></html>"
+                                           "]]>".format(watch_title, html_diff))

                fe.guid(guid, permalink=False)
                dt = datetime.datetime.fromtimestamp(int(watch.newest_history_key))
@@ -458,19 +459,6 @@ def changedetection_app(config=None, datastore_o=None):

        return 'OK'

-
-    @app.route("/scrub/<string:uuid>", methods=['GET'])
-    @login_required
-    def scrub_watch(uuid):
-        try:
-            datastore.scrub_watch(uuid)
-        except KeyError:
-            flash('Watch not found', 'error')
-        else:
-            flash("Scrubbed watch {}".format(uuid))
-
-        return redirect(url_for('index'))
-
    @app.route("/scrub", methods=['GET', 'POST'])
    @login_required
    def scrub_page():
@@ -822,13 +810,7 @@ def changedetection_app(config=None, datastore_o=None):

        screenshot_url = datastore.get_screenshot(uuid)

-        system_uses_webdriver = datastore.data['settings']['application']['fetch_backend'] == 'html_webdriver'
-
-        is_html_webdriver = True if watch.get('fetch_backend') == 'html_webdriver' or (
-                    watch.get('fetch_backend', None) is None and system_uses_webdriver) else False
-
-        output = render_template("diff.html",
-                                 watch_a=watch,
+        output = render_template("diff.html", watch_a=watch,
                                 newest=newest_version_file_contents,
                                 previous=previous_version_file_contents,
                                 extra_stylesheets=extra_stylesheets,
@@ -839,8 +821,7 @@ def changedetection_app(config=None, datastore_o=None):
                                 current_diff_url=watch['url'],
                                 extra_title=" - Diff - {}".format(watch['title'] if watch['title'] else watch['url']),
                                 left_sticky=True,
-                                 screenshot=screenshot_url,
-                                 is_html_webdriver=is_html_webdriver)
+                                 screenshot=screenshot_url)

        return output

@@ -901,11 +882,6 @@ def changedetection_app(config=None, datastore_o=None):
            content.append({'line': "No history found", 'classes': ''})

        screenshot_url = datastore.get_screenshot(uuid)
-        system_uses_webdriver = datastore.data['settings']['application']['fetch_backend'] == 'html_webdriver'
-
-        is_html_webdriver = True if watch.get('fetch_backend') == 'html_webdriver' or (
-                watch.get('fetch_backend', None) is None and system_uses_webdriver) else False
-
        output = render_template("preview.html",
                                 content=content,
                                 extra_stylesheets=extra_stylesheets,
@@ -914,9 +890,8 @@ def changedetection_app(config=None, datastore_o=None):
                                 current_diff_url=watch['url'],
                                 screenshot=screenshot_url,
                                 watch=watch,
-                                 uuid=uuid,
-                                 is_html_webdriver=is_html_webdriver)
-
+                                 uuid=uuid)
+        
        return output

    @app.route("/settings/notification-logs", methods=['GET'])
@@ -924,7 +899,7 @@ def changedetection_app(config=None, datastore_o=None):
    def notification_logs():
        global notification_debug_log
        output = render_template("notification-log.html",
-                                 logs=notification_debug_log if len(notification_debug_log) else ["Notification logs are empty - no notifications sent yet."])
+                                 logs=notification_debug_log if len(notification_debug_log) else ["No errors or warnings detected"])

        return output

@@ -1244,9 +1219,6 @@ def check_for_new_version():

 def notification_runner():
    global notification_debug_log
-    from datetime import datetime
-    import json
-
    while not app.config.exit.is_set():
        try:
            # At the moment only one thread runs (single runner)
@@ -1255,12 +1227,9 @@ def notification_runner():
            time.sleep(1)

        else:
-
-            now = datetime.now()
-
+            # Process notifications
            try:
                from changedetectionio import notification
-
                notification.process_notification(n_object, datastore)

            except Exception as e:
@@ -1274,10 +1243,9 @@ def notification_runner():
                log_lines = str(e).splitlines()
                notification_debug_log += log_lines

-            # Process notifications
-            notification_debug_log+= ["{} - SENDING {}".format(now.strftime("%Y/%m/%d %H:%M:%S,000"), json.dumps(n_object))]
-            # Trim the log length
-            notification_debug_log = notification_debug_log[-100:]
+                # Trim the log length
+                notification_debug_log = notification_debug_log[-100:]
+

 # Thread runner to check every minute, look for new watches to feed into the Queue.
 def ticker_thread_check_time_launch_checks():
--- a/changedetectionio/notification.py
+++ b/changedetectionio/notification.py
@@ -97,8 +97,6 @@ def process_notification(n_object, datastore):
                if log_value and 'WARNING' in log_value or 'ERROR' in log_value:
                    raise Exception(log_value)

-
-
 # Notification title + body content parameters get created here.
 def create_notification_parameters(n_object, datastore):
    from copy import deepcopy
--- a/changedetectionio/static/js/diff-overview.js
+++ b/changedetectionio/static/js/diff-overview.js
@@ -1,17 +0,0 @@
-$(document).ready(function () {
-    // Load it when the #screenshot tab is in use, so we dont give a slow experience when waiting for the text diff to load
-    window.addEventListener('hashchange', function (e) {
-        toggle(location.hash);
-    }, false);
-
-    toggle(location.hash);
-
-    function toggle(hash_name) {
-        if (hash_name === '#screenshot') {
-            $("img#screenshot-img").attr('src', screenshot_url);
-            $("#settings").hide();
-        } else {
-            $("#settings").show();
-        }
-    }
-});
--- a/changedetectionio/store.py
+++ b/changedetectionio/store.py
@@ -254,23 +254,12 @@ class ChangeDetectionStore:
    def scrub_watch(self, uuid):
        import pathlib

-        self.__data['watching'][uuid].update(
-            {'last_checked': 0,
-             'last_changed': 0,
-             'last_viewed': 0,
-             'previous_md5': False,
-             'last_notification_error': False,
-             'last_error': False})
-
-        # JSON Data, Screenshots, Textfiles (history index and snapshots), HTML in the future etc
-        for item in pathlib.Path(os.path.join(self.datastore_path, uuid)).rglob("*.*"):
-            unlink(item)
-
-        # Force the attr to recalculate
-        bump = self.__data['watching'][uuid].history
-
+        self.__data['watching'][uuid].update({'history': {}, 'last_checked': 0, 'last_changed': 0, 'previous_md5': False})
        self.needs_write_urgent = True

+        for item in pathlib.Path(self.datastore_path).rglob(uuid+"/*.txt"):
+            unlink(item)
+
    def add_watch(self, url, tag="", extras=None, write_to_disk_now=True):

        if extras is None:
--- a/changedetectionio/templates/_common_fields.jinja
+++ b/changedetectionio/templates/_common_fields.jinja
@@ -14,7 +14,7 @@
                                <li>Use <a target=_new href="https://github.com/caronc/apprise">AppRise URLs</a> for notification to just about any service! <i><a target=_new href="https://github.com/dgtlmoon/changedetection.io/wiki/Notification-configuration-notes">Please read the notification services wiki here for important configuration notes</a></i>.</li>
                                <li><code>discord://</code> only supports a maximum <strong>2,000 characters</strong> of notification text, including the title.</li>
                                <li><code>tgram://</code> bots cant send messages to other bots, so you should specify chat ID of non-bot user.</li>
-
+                                <li>Go here for <a href="{{url_for('notification_logs')}}">notification debug logs</a></li>
                              </ul>
                            </div>
                            <br/>
@@ -22,7 +22,6 @@
 {% if emailprefix %}
                            <a id="add-email-helper" class="pure-button button-secondary button-xsmall" style="font-size: 70%">Add email</a>
 {% endif %}
-                            <a href="{{url_for('notification_logs')}}" class="pure-button button-secondary button-xsmall" style="font-size: 70%">Notification debug logs</a>
                        </div>
                        <div id="notification-customisation" class="pure-control-group">
                            <div class="pure-control-group">
--- a/changedetectionio/templates/diff.html
+++ b/changedetectionio/templates/diff.html
@@ -1,11 +1,6 @@
 {% extends 'base.html' %}

 {% block content %}
-<script>
-    const screenshot_url="{{url_for('static_content', group='screenshot', filename=uuid)}}";
-</script>
-<script type="text/javascript" src="{{url_for('static_content', group='js', filename='diff-overview.js')}}" defer></script>
-
 <div id="settings">
    <h1>Differences</h1>
    <form class="pure-form " action="" method="GET">
@@ -44,7 +39,6 @@
 <div class="tabs">
    <ul>
        <li class="tab" id="default-tab"><a href="#text">Text</a></li>
-        <li class="tab" id="screenshot-tab"><a href="#screenshot">Screenshot</a></li>
    </ul>
 </div>

@@ -66,21 +60,6 @@
         </table>
         Diff algorithm from the amazing <a href="https://github.com/kpdecker/jsdiff">github.com/kpdecker/jsdiff</a>
     </div>
-     <div class="tab-pane-inner" id="screenshot">
-         <div class="tip">
-             For now, Differences are performed on text, not graphically, only the latest screenshot is available.
-         </div>
-         </br>
-         {% if is_html_webdriver %}
-           {% if screenshot %}
-             <img style="max-width: 80%" id="screenshot-img" alt="Current screenshot from most recent request"/>
-           {% else %}
-              No screenshot available just yet! Try rechecking the page.
-           {% endif %}
-         {% else %}
-           <strong>Screenshot requires Playwright/WebDriver enabled</strong>
-         {% endif %}
-     </div>
 </div>


--- a/changedetectionio/templates/edit.html
+++ b/changedetectionio/templates/edit.html
@@ -259,8 +259,6 @@ nav

                    <a href="{{url_for('form_delete', uuid=uuid)}}"
                       class="pure-button button-small button-error ">Delete</a>
-                    <a href="{{url_for('scrub_watch', uuid=uuid)}}"
-                       class="pure-button button-small button-error ">Scrub</a>
                    <a href="{{url_for('form_clone', uuid=uuid)}}"
                       class="pure-button button-small ">Create Copy</a>
                </div>
--- a/changedetectionio/templates/notification-log.html
+++ b/changedetectionio/templates/notification-log.html
@@ -4,7 +4,7 @@
 <div class="edit-form">
     <div class="inner">

-         <h4 style="margin-top: 0px;">Notification debug log</h4>
+         <h4 style="margin-top: 0px;">The following issues were detected when sending notifications</h4>
                <div id="notification-error-log">
                <ul style="font-size: 80%; margin:0px; padding: 0 0 0 7px">
                {% for log in logs|reverse %}
--- a/changedetectionio/templates/preview.html
+++ b/changedetectionio/templates/preview.html
@@ -1,10 +1,6 @@
 {% extends 'base.html' %}

 {% block content %}
-<script>
-    const screenshot_url="{{url_for('static_content', group='screenshot', filename=uuid)}}";
-</script>
-<script type="text/javascript" src="{{url_for('static_content', group='js', filename='diff-overview.js')}}" defer></script>

 <div id="settings">
    <h1>Current - {{watch.last_checked|format_timestamp_timeago}}</h1>
@@ -14,7 +10,6 @@
 <div class="tabs">
    <ul>
        <li class="tab" id="default-tab"><a href="#text">Text</a></li>
-        <li class="tab" id="screenshot-tab"><a href="#screenshot">Screenshot</a></li>
    </ul>
 </div>

@@ -33,20 +28,5 @@
            </tbody>
        </table>
    </div>
-     <div class="tab-pane-inner" id="screenshot">
-         <div class="tip">
-             For now, Differences are performed on text, not graphically, only the latest screenshot is available.
-         </div>
-         </br>
-         {% if is_html_webdriver %}
-           {% if screenshot %}
-             <img style="max-width: 80%" id="screenshot-img" alt="Current screenshot from most recent request"/>
-           {% else %}
-              No screenshot available just yet! Try rechecking the page.
-           {% endif %}
-         {% else %}
-           <strong>Screenshot requires Playwright/WebDriver enabled</strong>
-         {% endif %}
-     </div>
 </div>
 {% endblock %}