diff --git a/assets/scheduler.yaml b/assets/scheduler.yaml index 65d14ed..95b0097 100644 --- a/assets/scheduler.yaml +++ b/assets/scheduler.yaml @@ -1,7 +1,7 @@ --- scheduler: alias: test - cron: '*/5 * * * *' + cron: '* * * * *' enableLog: false # (Optional) default: false property: diff --git a/lib/cli/commands/command_scheduler.dart b/lib/cli/commands/command_scheduler.dart index 5d5f0f8..85c7056 100644 --- a/lib/cli/commands/command_scheduler.dart +++ b/lib/cli/commands/command_scheduler.dart @@ -22,7 +22,7 @@ class CommandScheduler extends CommandBase { for (var i = 0; i < parameters.length; ++i) { var item = parameters[i]; if (item.startsWith('-l')) { - _scheduler.showList(); + await _scheduler.showList(); break; } else if (item.startsWith('-r')) { var file = ''; diff --git a/lib/cli/commands/scheduler/scheduler_manager.dart b/lib/cli/commands/scheduler/scheduler_manager.dart index 197813d..b88a8a7 100644 --- a/lib/cli/commands/scheduler/scheduler_manager.dart +++ b/lib/cli/commands/scheduler/scheduler_manager.dart @@ -47,6 +47,10 @@ class SchedulerManager { return hash; } + String get startupID { + return isDebug ? '$appIdendifier.debug' : appIdendifier; + } + SchedulerManager(); factory SchedulerManager.create() { @@ -111,7 +115,7 @@ class SchedulerManager { } } - void showList() { + Future showList() async { print(''); var scheduleList = schedulers; if(scheduleList.isEmpty) { @@ -126,6 +130,8 @@ class SchedulerManager { } print(''); } + checkProcess(); + return simpleFuture; } Future terminate() async { @@ -158,11 +164,10 @@ class SchedulerManager { //process check var processes = await findProcess('scheduler -s'); for(var process in processes) { - print(process.name); var processName = process.name; if(processName.contains('main.dart scheduler -s') || processName.contains('$appName scheduler -s')) { currentScheduler = process; - print('Scheduler is running on pid ${currentScheduler!.pid}.'); + print('Scheduler is running on pid [${currentScheduler!.pid}].'); break; } } @@ -170,21 +175,21 @@ class SchedulerManager { } Future checkStartup() async { - if(!await OSStartup.isRegistedStartup(appIdendifier)) { + if(!await OSStartup.isRegistedStartup(startupID)) { List param = []; if(isDebug) { param.add(scriptPath); } param.add('scheduler'); param.add('-s'); - await OSStartup.registStartup(executablePath, appIdendifier, arguments: param); + await OSStartup.registStartup(executablePath, startupID, arguments: param); } return simpleFuture; } Future unregistStartup() async { - if(await OSStartup.isRegistedStartup(appIdendifier)) { - await OSStartup.unregistStartup(appIdendifier); + if(await OSStartup.isRegistedStartup(startupID)) { + await OSStartup.unregistStartup(startupID); } return simpleFuture; }