0.0.4

Added a few new functions.

Author: foresle

dashboard/helpers.py

@@ -1,12 +1,13 @@
 import datetime
 import json
-
 import synapse_graph as synapse_graph
 from django.core.cache import cache
 import synapse_admin
 import math
 from django.conf import settings
 
+from project.helpers import spent_time_counter
+
 
 def convert_size(size_bytes: int):
     if size_bytes == 0:
@@ -19,6 +20,7 @@ def convert_size(size_bytes: int):
     return '%s %s' % (s, size_name[i])
 
 
+@spent_time_counter
 def load_media_statistics(access_token: str, server_name: str) -> None:
     media_manager: synapse_admin.Media = synapse_admin.Media(
         server_addr=server_name,
@@ -44,6 +46,7 @@ def load_media_statistics(access_token: str, server_name: str) -> None:
     cache.set(settings.CACHED_USERS, users, 60 * 60 * 60 * 24)  # 1 day
 
 
+@spent_time_counter
 def load_server_map(access_token: str, server_name: str) -> None:
     try:
         graph = synapse_graph.SynapseGraph(

dashboard/views.py

@@ -83,6 +83,8 @@ def get_context_data(self, **kwargs):
 
         context['dashboard_page_active'] = True
 
+        context['operations'] = list(reversed(cache.get(settings.CACHED_OPERATIONS_MESSAGES, [])))
+
         return context
 
 

project/helpers.py

@@ -1,4 +1,6 @@
+import datetime
 from django.conf import settings
+from django.core.cache import cache
 
 
 def assemble_mxc_url(mxc_url: str) -> (str, str):
@@ -23,3 +25,34 @@ def get_download_url_for_media(media_id: str, server_name: str | None = None, ac
         access_token = settings.MATRIX_ADMIN_TOKEN
 
     return f'https://{settings.MATRIX_DOMAIN}/_matrix/media/v3/download/{server_name}/{media_id}?access_token={access_token}'
+
+
+def make_operation_message(func_name: str, spent_time: datetime.timedelta) -> None:
+    """
+    Make operation object and then save to cache.
+    """
+
+    operation_message: dict = {
+        'name': func_name,
+        'spent_time': spent_time.seconds,
+        'made_at': datetime.datetime.now()
+    }
+
+    operations_messages: list = cache.get(settings.CACHED_OPERATIONS_MESSAGES, [])
+    operations_messages.append(operation_message)
+
+    cache.set(settings.CACHED_OPERATIONS_MESSAGES, operations_messages, 60*60*60*24*7)
+
+
+def spent_time_counter(func):
+    """
+    Record spent time and save to cached operations.
+    """
+
+    def wrapper(*args, **kwargs):
+        start_time: datetime.datetime = datetime.datetime.now()
+        result = func(*args, **kwargs)
+        make_operation_message(func_name=func.__name__, spent_time=datetime.datetime.now() - start_time)
+        return result
+
+    return wrapper

project/settings.py

@@ -139,6 +139,8 @@
 CACHED_MEDIA_STATISTICS: str = 'media_statistics'
 CACHED_MEDIA_STATISTICS_UPDATED_AT: str = 'media_statistics_updated_at'
 
+CACHED_OPERATIONS_MESSAGES: str = 'operations_messages'
+
 # CELERY
 CELERY_BEAT_SCHEDULE = {
     'update_users_info_every_30m': {
@@ -149,10 +151,6 @@
         'task': 'rooms.tasks.update_rooms_info',
         'schedule': 60 * 30
     },
-    'update_media_statistics_info_every_1h': {
-        'task': 'dashboard.tasks.update_media_statistics_info',
-        'schedule': 60 * 60
-    },
     'update_server_map_every_12h': {
         'task': 'users.tasks.dashboard.tasks.update_server_map',
         'schedule': 60 * 60 * 12

rooms/helpers.py

@@ -4,9 +4,10 @@
 from django.core.cache import cache
 from synapse_admin.base import SynapseException
 
-from project.helpers import assemble_mxc_url, get_download_url_for_media
+from project.helpers import assemble_mxc_url, get_download_url_for_media, spent_time_counter
 
 
+@spent_time_counter
 def load_rooms(access_token: str, server_name: str) -> None:
     """
     Load rooms and cache it to redis.

server_notices/helpers.py

@@ -1,7 +1,10 @@
 import markdown as markdown
 import requests
 
+from project.helpers import spent_time_counter
 
+
+@spent_time_counter
 def send_server_notice(access_token: str, server_name: str, payload: str, user_id: str) -> bool:
     response = requests.post(url=f'https://{server_name}/_synapse/admin/v1/send_server_notice',
                              headers={

templates/dashboard/dashboard.html

@@ -72,6 +72,35 @@
                 The amount of memory used: Error
             {% endif %}
         </div>
+        <div class="table-responsive">
+            <table class="table table-dark table-striped">
+                <caption>Executed tasks.</caption>
+                <thead>
+                <tr>
+                    <th>TASK</th>
+                    <th>EXECUTED AT</th>
+                    <th>SPENT TIME</th>
+                </tr>
+                </thead>
+                <tbody>
+                {% if operations %}
+                    {% for operation in operations %}
+                        <tr>
+                            <td>{{ operation.name }}</td>
+                            <td>{{ operation.made_at }}</td>
+                            <td>{{ operation.spent_time }} seconds</td>
+                        </tr>
+                    {% endfor %}
+                {% else %}
+                    <tr>
+                        <td>-</td>
+                        <td>-</td>
+                        <td>-</td>
+                    </tr>
+                {% endif %}
+                </tbody>
+            </table>
+        </div>
     </div>
 {% endblock %}
 

templates/rooms/room.html

@@ -19,7 +19,7 @@
                 <li class="list-group-item">Federatable: {% if room.federatable %} Yes {% else %} No {% endif %}</li>
                 <li class="list-group-item">Version: {{ room.version }}</li>
                 <li class="list-group-item">Creator: {{ room.creator }}</li>
-                <li class="list-group-item">Public: {{ room.public }}</li>
+                <li class="list-group-item">Public: {% if room.public %} Yes {% else %} No {% endif %}</li>
                 {% if room.local_members %}
                     <li class="list-group-item text-center">LOCAL MEMBERS</li>
                     {% for member in room.local_members %}

templates/users/user.html

@@ -26,6 +26,7 @@
                 <li class="list-group-item">Created at: {{ user.created_at }}</li>
                 <li class="list-group-item">Last seen IP: {{ user.last_seen_ip }} - {{ user.last_seen_country }}</li>
                 <li class="list-group-item">Last seen at: {{ user.last_seen_at }}</li>
+                <li class="list-group-item">Last seen user agent: {{ user.last_seen_user_agent }}</li>
                 <li class="list-group-item">Is admin: {% if user.is_admin %} Yes {% else %} No {% endif %}</li>
                 <li class="list-group-item">Is deactivated: {% if user.is_deactivated %} Yes {% else %}
                     No {% endif %}</li>

users/helpers.py

@@ -5,7 +5,8 @@
 import synapse_admin
 from django.conf import settings
 
-from project.helpers import get_download_url_for_media, assemble_mxc_url
+from project.helpers import get_download_url_for_media, assemble_mxc_url, spent_time_counter
+from dashboard.helpers import load_media_statistics
 
 
 def get_country_by_ip(ip: str) -> str:
@@ -24,7 +25,8 @@ def get_last_seen_info(access_token: str, server_name: str, user_id: str) -> dic
     last_seen: dict = {
         'last_seen_ip': 'Unknown',
         'last_seen_at': 'Unknown',
-        'last_seen_country': 'Unknown'
+        'last_seen_country': 'Unknown',
+        'last_seen_user_agent': 'Unknown'
     }
 
     user_manager: synapse_admin.User = synapse_admin.User(
@@ -40,12 +42,14 @@ def get_last_seen_info(access_token: str, server_name: str, user_id: str) -> dic
         last_seen = {
             'last_seen_ip': active_sessions[0]['ip'],
             'last_seen_at': datetime.fromtimestamp(active_sessions[0]['last_seen'] / 1000),
-            'last_seen_country': get_country_by_ip(active_sessions[0]['ip'])
+            'last_seen_country': get_country_by_ip(active_sessions[0]['ip']),
+            'last_seen_user_agent': active_sessions[0]['user_agent']
         }
 
     return last_seen
 
 
+@spent_time_counter
 def load_users(access_token: str, server_name: str) -> None:
     """
     Load users and cache it to redis.
@@ -88,7 +92,11 @@ def load_users(access_token: str, server_name: str) -> None:
     cache.set(settings.CACHED_USERS_UPDATED_AT, datetime.now(), 60 * 60 * 60 * 24)
     cache.set(settings.CACHED_USERS, users, 60 * 60 * 60 * 24)
 
+    # Also update media statistics
+    load_media_statistics(access_token=access_token, server_name=server_name)
 
+
+@spent_time_counter
 def deactivate_user(access_token: str, server_name: str, user_id: str) -> bool:
     """
     Deactivate user in the server.
@@ -114,6 +122,7 @@ def deactivate_user(access_token: str, server_name: str, user_id: str) -> bool:
     return result
 
 
+@spent_time_counter
 def activate_user(access_token: str, server_name: str, user_id: str, new_password: str) -> bool:
     """
     Activate user in the server.
@@ -139,6 +148,7 @@ def activate_user(access_token: str, server_name: str, user_id: str, new_passwor
     return result
 
 
+@spent_time_counter
 def set_admin(access_token: str, server_name: str, user_id: str) -> bool:
     """
     Set admin of the server.
@@ -164,6 +174,7 @@ def set_admin(access_token: str, server_name: str, user_id: str) -> bool:
     return result
 
 
+@spent_time_counter
 def revoke_admin(access_token: str, server_name: str, user_id: str) -> bool:
     """
     Revoke admin of the server.