Merge pull request #35 from AGScheduler/dev

bugfix
AGScheduler · Jun 5, 2024 · 2cd2e33 · 2cd2e33
2 parents e817e19 + e7e78f8
commit 2cd2e33
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 18 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "agscheduler-cli"
-version = "0.3.1"
+version = "0.3.2"
 edition = "2021"
 description = "Command line interface for AGScheduler"
 license = "MIT"

diff --git a/src/api_client.rs b/src/api_client.rs
@@ -97,7 +97,8 @@ impl AGScheduler {
                 }
             }
             Err(err) => {
-                println!("Error: {}", err)
+                println!("Error: {}", err);
+                return;
             }
         }
         let func_name = interaction.select_func_name(fn_selections);
@@ -184,7 +185,8 @@ impl AGScheduler {
                 }
             }
             Err(err) => {
-                println!("Error: {}", err)
+                println!("Error: {}", err);
+                return;
             }
         }
 
@@ -577,9 +579,7 @@ mod tests {
                         "last_run_time": "0001-01-01T00:00:00Z",
                         "name": "myJob",
                         "next_run_time": "2024-04-15T04:19:12Z",
-                        "queues": [
-                            "default"
-                        ],
+                        "queues": [],
                         "start_at": "",
                         "status": "running",
                         "timeout": "1h",
@@ -610,9 +610,7 @@ mod tests {
                             "last_run_time": "0001-01-01T00:00:00Z",
                             "name": "myJob",
                             "next_run_time": "2024-04-15T04:19:12Z",
-                            "queues": [
-                                "default"
-                            ],
+                            "queues": [],
                             "start_at": "",
                             "status": "running",
                             "timeout": "1h",
@@ -631,9 +629,7 @@ mod tests {
                             "last_run_time": "0001-01-01T00:00:00Z",
                             "name": "myJob2",
                             "next_run_time": "2024-04-15T04:19:12Z",
-                            "queues": [
-                                "default"
-                            ],
+                            "queues": [],
                             "start_at": "2024-05-16 17:16:08",
                             "status": "running",
                             "timeout": "1h",
@@ -652,9 +648,7 @@ mod tests {
                             "last_run_time": "0001-01-01T00:00:00Z",
                             "name": "myJob3",
                             "next_run_time": "2024-04-15T04:19:12Z",
-                            "queues": [
-                                "default"
-                            ],
+                            "queues": [],
                             "start_at": "",
                             "status": "running",
                             "timeout": "1h",
@@ -839,7 +833,7 @@ mod tests {
         mock.expect_input_timezone().return_const("UTC");
         mock.expect_input_args().return_const("{}");
         mock.expect_input_timeout().return_const("1h");
-        mock.expect_input_queues().return_const("[\"default\"]");
+        mock.expect_input_queues().return_const("[]");
         mock.expect_input_page().return_const(page);
         mock.expect_input_page_size().return_const(page_size);
         mock.expect_select_type().return_const("Interval");

diff --git a/src/interaction.rs b/src/interaction.rs
@@ -128,7 +128,7 @@ impl InteractionTrait for Interaction {
 
     #[cfg_attr(coverage_nightly, coverage(off))]
     fn input_queues(&self, text: &str) -> String {
-        self.input_common_default("Queues", "[\"default\"]", text)
+        self.input_common_default("Queues", "[]", text)
             .trim()
             .to_string()
     }