use internal-noti-api send license-expiring notice

seatable · Oct 20, 2023 · 3c72505 · 3c72505
1 parent bbffbf3
commit 3c72505
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 19 deletions.
diff --git a/dtable_events/app/config.py b/dtable_events/app/config.py
@@ -42,6 +42,7 @@
     BIG_DATA_ROW_IMPORT_LIMIT = getattr(seahub_settings, 'BIG_DATA_ROW_IMPORT_LIMIT', 500000)
     BIG_DATA_ROW_UPDATE_LIMIT = getattr(seahub_settings, 'BIG_DATA_ROW_UPDATE_LIMIT', 500000)
     TRASH_CLEAN_AFTER_DAYS = getattr(seahub_settings, 'TRASH_CLEAN_AFTER_DAYS', 30)
+    LICENSE_PATH = getattr(seahub_settings, 'LICENSE_PATH', '/shared/seatable-license.txt')
 except Exception as e:
     logger.critical("Can not import dtable_web settings: %s." % e)
     raise RuntimeError("Can not import dtable_web settings: %s" % e)

diff --git a/dtable_events/tasks/license_expiring_notices_sender.py b/dtable_events/tasks/license_expiring_notices_sender.py
@@ -9,25 +9,25 @@
 
 from seaserv import ccnet_api
 
-from dtable_events.app.config import dtable_web_dir
+from dtable_events.app.config import LICENSE_PATH, DTABLE_WEB_SERVICE_URL
 from dtable_events.db import init_db_session_class
-from dtable_events.utils import get_opt_from_conf_or_env, get_python_executable, run
+from dtable_events.utils import get_opt_from_conf_or_env
+from dtable_events.utils.dtable_web_api import DTableWebAPI
 
 
 class LicenseExpiringNoticesSender:
 
     def __init__(self, config):
         self._db_session_class = init_db_session_class(config)
         self.days = [35, 15, 7, 6, 5, 4, 3, 2, 1]
-        self.license_path = '/shared/seatable-license.txt'
+        self.license_path = LICENSE_PATH
         self._parse_config(config)
         logdir = os.path.join(os.environ.get('LOG_DIR', ''))
         self._logfile = os.path.join(logdir, 'license_expiring_notices_sender.log')
 
     def _parse_config(self, config):
         section_name = 'LICENSE-EXPIRING-NOTICES-SENDER'
         key_days = 'days'
-        key_license_path = 'license_path'
         if not config.has_section(section_name):
             return
 
@@ -42,7 +42,6 @@ def _parse_config(self, config):
                 pass
         if days:
             self.days = days
-        self.license_path = get_opt_from_conf_or_env(config, section_name, key_license_path, default='/shared/seatable-license.txt')
 
     def start(self):
         timer = LicenseExpiringNoticesSenderTimer(self._db_session_class, self.days, self.license_path, self._logfile)
@@ -90,19 +89,14 @@ def check():
                 logging.warning('No expire date found: %s error: %s', expire_str, e)
                 return
             days = (expire_date - date.today()).days
-            if days in self.days:
-                try:
-                    python_exec = get_python_executable()
-                    manage_py = os.path.join(dtable_web_dir, 'manage.py')
-                    cmd = [
-                        python_exec,
-                        manage_py,
-                        'send_license_expiring_notices',
-                        str(days),
-                    ]
-                    with open(self._logfile, 'a') as fp:
-                        run(cmd, cwd=dtable_web_dir, output=fp)
-                except Exception as e:
-                    logging.exception('error when cleaning trash dtables: %s', e)
+            if days not in self.days:
+                return
+            admin_users = ccnet_api.get_superusers()
+            dtable_web_api = DTableWebAPI(DTABLE_WEB_SERVICE_URL)
+            to_users = [user.email for user in admin_users]
+            try:
+                dtable_web_api.internal_add_notification(to_users, 'license_expiring', {'days': days})
+            except Exception as e:
+                logging.exception('send license expiring days: %s to users: %s error: %s', days, to_users, e)
 
         sched.start()