fix: prevent early return of cron loop (#1031)

TabbyML · Dec 14, 2023 · ac7152c · ac7152c
1 parent cf89342
commit ac7152c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 13 deletions.
diff --git a/ee/tabby-webserver/src/schema/auth.rs b/ee/tabby-webserver/src/schema/auth.rs
@@ -39,21 +39,18 @@ pub fn validate_jwt(token: &str) -> jwt::errors::Result<JWTPayload> {
 }
 
 fn jwt_token_secret() -> String {
-    let jwt_secret = match std::env::var("TABBY_WEBSERVER_JWT_TOKEN_SECRET") {
-        Ok(x) => x,
-        Err(_) => {
-            eprintln!("
+    let jwt_secret = std::env::var("TABBY_WEBSERVER_JWT_TOKEN_SECRET").unwrap_or_else(|_| {
+        eprintln!("
     \x1b[93;1mJWT secret is not set\x1b[0m
 
     Tabby server will generate a one-time (non-persisted) JWT secret for the current process.
     Please set the \x1b[94mTABBY_WEBSERVER_JWT_TOKEN_SECRET\x1b[0m environment variable for production usage.
 "
-            );
-            Uuid::new_v4().to_string()
-        }
-    };
+        );
+        Uuid::new_v4().to_string()
+    });
 
-    if uuid::Uuid::parse_str(&jwt_secret).is_err() {
+    if Uuid::parse_str(&jwt_secret).is_err() {
         warn!("JWT token secret needs to be in standard uuid format to ensure its security, you might generate one at https://www.uuidgenerator.net");
         std::process::exit(1)
     }

diff --git a/ee/tabby-webserver/src/service/cron.rs b/ee/tabby-webserver/src/service/cron.rs
@@ -2,7 +2,7 @@ use std::time::Duration;
 
 use anyhow::Result;
 use tokio_cron_scheduler::{Job, JobScheduler};
-use tracing::{error, warn};
+use tracing::error;
 
 use crate::service::db::DbConn;
 
@@ -32,7 +32,7 @@ async fn new_refresh_token_job(db_conn: DbConn) -> Result<Job> {
 
 pub fn run_offline_job(db_conn: DbConn) {
     tokio::spawn(async move {
-        let Ok(job) = new_refresh_token_job(db_conn.clone()).await else {
+        let Ok(job) = new_refresh_token_job(db_conn).await else {
             error!("failed to create db job");
             return;
         };
@@ -48,8 +48,8 @@ pub fn run_offline_job(db_conn: DbConn) {
                     tokio::time::sleep(duration).await;
                 }
                 Ok(None) => {
-                    warn!("no job available, exit scheduler");
-                    return;
+                    // wait until scheduler increases jobs' tick
+                    tokio::time::sleep(Duration::from_millis(500)).await;
                 }
                 Err(e) => {
                     error!("failed to get job sleep time: {}, re-try in 1 second", e);