fb

Author: YunchuWang

samples/ScheduleConsoleApp/Program.cs

@@ -52,7 +52,6 @@
 
 // Run the schedule operations
 ScheduledTaskClient scheduledTaskClient = host.Services.GetRequiredService<ScheduledTaskClient>();
-ScheduleOperations scheduleOperations = new ScheduleOperations(scheduledTaskClient);
-await scheduleOperations.RunAsync();
+await ScheduleDemo.RunDemoAsync(scheduledTaskClient);
 
 await host.StopAsync();

…ScheduleConsoleApp/ScheduleOperations.cs …mples/ScheduleConsoleApp/ScheduleDemo.cssamples/ScheduleConsoleApp/ScheduleOperations.cs renamed to samples/ScheduleConsoleApp/ScheduleDemo.cs samples/ScheduleConsoleApp/ScheduleOperations.cs renamed to samples/ScheduleConsoleApp/ScheduleDemo.cs

@@ -6,41 +6,44 @@
 
 namespace ScheduleConsoleApp;
 
-class ScheduleOperations(ScheduledTaskClient scheduledTaskClient)
+/// <summary>
+/// Demonstrates various schedule operations in a sample application.
+/// </summary>
+static class ScheduleDemo
 {
-    readonly ScheduledTaskClient scheduledTaskClient = scheduledTaskClient ?? throw new ArgumentNullException(nameof(scheduledTaskClient));
-
-    public async Task RunAsync()
+    public static async Task RunDemoAsync(ScheduledTaskClient scheduledTaskClient)
     {
+        ArgumentNullException.ThrowIfNull(scheduledTaskClient);
+
         try
         {
-            await this.DeleteExistingSchedulesAsync();
-            await this.CreateAndManageScheduleAsync();
+            await DeleteExistingSchedulesAsync(scheduledTaskClient);
+            await CreateAndManageScheduleAsync(scheduledTaskClient);
         }
         catch (Exception ex)
         {
             Console.WriteLine($"One of your schedule operations failed, please fix and rerun: {ex.Message}");
         }
     }
 
-    async Task DeleteExistingSchedulesAsync()
+    static async Task DeleteExistingSchedulesAsync(ScheduledTaskClient scheduledTaskClient)
     {
         // Define the initial query with the desired page size
         ScheduleQuery query = new ScheduleQuery { PageSize = 100 };
 
         // Retrieve the pageable collection of schedule IDs
-        AsyncPageable<ScheduleDescription> schedules = this.scheduledTaskClient.ListSchedulesAsync(query);
+        AsyncPageable<ScheduleDescription> schedules = scheduledTaskClient.ListSchedulesAsync(query);
 
         // Delete each existing schedule
         await foreach (ScheduleDescription schedule in schedules)
         {
-            ScheduleClient scheduleClient1 = this.scheduledTaskClient.GetScheduleClient(schedule.ScheduleId);
-            await scheduleClient1.DeleteAsync();
+            ScheduleClient scheduleClient = scheduledTaskClient.GetScheduleClient(schedule.ScheduleId);
+            await scheduleClient.DeleteAsync();
             Console.WriteLine($"Deleted schedule {schedule.ScheduleId}");
         }
     }
 
-    async Task CreateAndManageScheduleAsync()
+    static async Task CreateAndManageScheduleAsync(ScheduledTaskClient scheduledTaskClient)
     {
         // Create schedule options that runs every 4 seconds
         ScheduleCreationOptions scheduleOptions = new ScheduleCreationOptions(
@@ -53,7 +56,7 @@ async Task CreateAndManageScheduleAsync()
         };
 
         // Create the schedule and get a handle to it
-        ScheduleClient scheduleClient = await this.scheduledTaskClient.CreateScheduleAsync(scheduleOptions);
+        ScheduleClient scheduleClient = await scheduledTaskClient.CreateScheduleAsync(scheduleOptions);
 
         // Get and print the initial schedule description
         await PrintScheduleDescriptionAsync(scheduleClient);

src/ScheduledTasks/Client/ScheduleClientImpl.cs

@@ -65,10 +65,7 @@ public override async Task CreateAsync(ScheduleCreationOptions creationOptions,
         }
         catch (Exception ex)
         {
-            this.logger.ClientError(
-                nameof(this.CreateAsync),
-                this.ScheduleId,
-                ex);
+            this.logger.ClientError(nameof(this.CreateAsync), this.ScheduleId, ex);
 
             throw;
         }
@@ -115,10 +112,7 @@ public override async Task<ScheduleDescription> DescribeAsync(CancellationToken
         }
         catch (Exception ex)
         {
-            this.logger.ClientError(
-                nameof(this.DescribeAsync),
-                this.ScheduleId,
-                ex);
+            this.logger.ClientError(nameof(this.DescribeAsync), this.ScheduleId, ex);
 
             throw;
         }
@@ -152,10 +146,7 @@ public override async Task PauseAsync(CancellationToken cancellation = default)
         }
         catch (Exception ex)
         {
-            this.logger.ClientError(
-                nameof(this.PauseAsync),
-                this.ScheduleId,
-                ex);
+            this.logger.ClientError(nameof(this.PauseAsync), this.ScheduleId, ex);
 
             throw;
         }
@@ -189,10 +180,7 @@ public override async Task ResumeAsync(CancellationToken cancellation = default)
         }
         catch (Exception ex)
         {
-            this.logger.ClientError(
-                nameof(this.ResumeAsync),
-                this.ScheduleId,
-                ex);
+            this.logger.ClientError(nameof(this.ResumeAsync), this.ScheduleId, ex);
 
             throw;
         }
@@ -227,10 +215,7 @@ public override async Task UpdateAsync(ScheduleUpdateOptions updateOptions, Canc
         }
         catch (Exception ex)
         {
-            this.logger.ClientError(
-                nameof(this.UpdateAsync),
-                this.ScheduleId,
-                ex);
+            this.logger.ClientError(nameof(this.UpdateAsync), this.ScheduleId, ex);
 
             throw;
         }
@@ -264,10 +249,7 @@ public override async Task DeleteAsync(CancellationToken cancellation = default)
         }
         catch (Exception ex)
         {
-            this.logger.ClientError(
-                nameof(this.DeleteAsync),
-                this.ScheduleId,
-                ex);
+            this.logger.ClientError(nameof(this.DeleteAsync), this.ScheduleId, ex);
 
             throw;
         }

src/ScheduledTasks/Client/ScheduledTaskClientImpl.cs

@@ -40,10 +40,7 @@ public override async Task<ScheduleClient> CreateScheduleAsync(ScheduleCreationO
         }
         catch (Exception ex)
         {
-            this.logger.ClientError(
-                nameof(this.CreateScheduleAsync),
-                creationOptions.ScheduleId,
-                ex);
+            this.logger.ClientError(nameof(this.CreateScheduleAsync), creationOptions.ScheduleId, ex);
 
             throw;
         }
@@ -74,10 +71,7 @@ public override async Task<ScheduleClient> CreateScheduleAsync(ScheduleCreationO
         }
         catch (Exception ex)
         {
-            this.logger.ClientError(
-                nameof(this.GetScheduleAsync),
-                scheduleId,
-                ex);
+            this.logger.ClientError(nameof(this.GetScheduleAsync), scheduleId, ex);
 
             throw;
         }
@@ -169,10 +163,7 @@ public override AsyncPageable<ScheduleDescription> ListSchedulesAsync(ScheduleQu
             }
             catch (Exception ex)
             {
-                this.logger.ClientError(
-                    nameof(this.ListSchedulesAsync),
-                    string.Empty,
-                    ex);
+                this.logger.ClientError(nameof(this.ListSchedulesAsync), string.Empty, ex);
 
                 throw;
             }

src/ScheduledTasks/Entity/Schedule.cs

@@ -251,8 +251,8 @@ public void RunSchedule(TaskEntityContext context, string executionToken)
 
         if (this.State.NextRunAt!.Value <= currentTime)
         {
-            this.StartOrchestration(context, currentTime);
-            this.State.LastRunAt = currentTime;
+            this.StartOrchestration(context, this.State.NextRunAt!.Value);
+            this.State.LastRunAt = this.State.NextRunAt!.Value;
             this.State.NextRunAt = null;
             this.State.NextRunAt = this.DetermineNextRunTime(scheduleConfig);
         }