userbogd/WebguiappTemplate
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cron expression validation and error reports

Browse Source
This commit is contained in:
Bogdan Pilyugin 2023-04-16 17:47:52 +02:00
parent 1612c0a830
commit 21c63bcadd
7 changed files with 41 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
HTML/application.html
View File

@ -28,6 +28,7 @@ timarr = [
~crontmr(14)~, ~crontmr(14)~,
~crontmr(15)~ ~crontmr(15)~
]; ];
function showcronerr(err) {if(err != "") alert(err);}
</script> </script>
</head> </head>
<body> <body>
@ -51,8 +52,9 @@ timarr = [
</section> </section>
</main> </main>
<script> <script>
drawtimers(timarr); drawtimers(timarr);
showMenu('header-toggle','navbar'); showMenu('header-toggle','navbar');
showcronerr("~cronerr~");
</script> </script>
</body> </body>
</html> </html>

1
HTML/res/cron.js
View File

@ -248,3 +248,4 @@ function drawtimers(tarr) {
target.innerHTML = content; target.innerHTML = content;
} }

2
components/esp_cron

@ -1 +1 @@
Subproject commit 6785ad092344b6c391fa24b0a0b25ffd258d79e6 Subproject commit e6cb1512fd3fb4fdb07ee1132d625f861331447d

1
main/include/AppConfiguration.h
View File

@ -42,6 +42,7 @@
#define CRON_TIMERS_NUMBER (16) #define CRON_TIMERS_NUMBER (16)
#define TIMER_NAME_LENGTH (16) #define TIMER_NAME_LENGTH (16)
#define TIMER_CRONSTRING_LENGTH (32) #define TIMER_CRONSTRING_LENGTH (32)
#define CRON_EXPRESS_MAX_LENGTH (128)
typedef struct typedef struct
{ {

3
main/include/CronTimers.h
View File

@ -24,9 +24,10 @@
#include "esp_err.h" #include "esp_err.h"
#include "cron.h" #include "cron.h"
#include "jobs.h" #include "jobs.h"
#include "ccronexpr.h"
esp_err_t InitCronSheduler(); esp_err_t InitCronSheduler();
esp_err_t ReloadCronSheduler(); esp_err_t ReloadCronSheduler();
char* GetCronError();
#endif /* MAIN_INCLUDE_CRONTIMERS_H_ */ #endif /* MAIN_INCLUDE_CRONTIMERS_H_ */

27
main/src/CronTimers.c
View File

@ -26,6 +26,12 @@
#define TAG "CRON_TIMER" #define TAG "CRON_TIMER"
static cron_job *JobsList[CRON_TIMERS_NUMBER]; static cron_job *JobsList[CRON_TIMERS_NUMBER];
static char cron_express_error[CRON_EXPRESS_MAX_LENGTH];
char* GetCronError()
{
return cron_express_error;
}
void custom_cron_job_callback(cron_job *job) void custom_cron_job_callback(cron_job *job)
{ {
@ -43,20 +49,39 @@ esp_err_t InitCronSheduler()
return res; return res;
} }
const char* check_expr(const char* expr) {
const char* err = NULL;
cron_expr test;
memset(&test, 0, sizeof(test));
cron_parse_expr(expr, &test, &err);
return err;
}
esp_err_t ReloadCronSheduler() esp_err_t ReloadCronSheduler()
{ {
//remove all jobs //remove all jobs
ESP_LOGI(TAG,"Cron stop call result %d",cron_stop()); ESP_LOGI(TAG,"Cron stop call result %d",cron_stop());
cron_job_clear_all(); cron_job_clear_all();
//check if we have jobs to run //check if we have jobs to run
bool isExpressError = false;
for (int i = 0; i < CRON_TIMERS_NUMBER; i++) for (int i = 0; i < CRON_TIMERS_NUMBER; i++)
{ {
if (!GetAppConf()->Timers[i].del && GetAppConf()->Timers[i].enab) const char* err = check_expr(GetAppConf()->Timers[i].cron);
if(err)
{
snprintf (cron_express_error, CRON_EXPRESS_MAX_LENGTH-1, "In timer %d expression error:%s", i+1, err);
ESP_LOGE(TAG, "%s", cron_express_error);
isExpressError = true;
continue;
}
else if (!GetAppConf()->Timers[i].del && GetAppConf()->Timers[i].enab)
{ {
JobsList[i] = cron_job_create(GetAppConf()->Timers[i].cron, custom_cron_job_callback, JobsList[i] = cron_job_create(GetAppConf()->Timers[i].cron, custom_cron_job_callback,
(void*) &GetAppConf()->Timers[i]); (void*) &GetAppConf()->Timers[i]);
} }
} }
if(!isExpressError) cron_express_error[0] = 0x00; //clear last cron expression parse
int jobs_num = cron_job_node_count(); int jobs_num = cron_job_node_count();
ESP_LOGI(TAG, "In config presents %d jobs", jobs_num); ESP_LOGI(TAG, "In config presents %d jobs", jobs_num);

7
main/src/HTTPPrintCustom.c
View File

@ -23,6 +23,7 @@
#include "webguiapp.h" #include "webguiapp.h"
#include "jWrite.h" #include "jWrite.h"
#include "AppConfiguration.h" #include "AppConfiguration.h"
#include "CronTimers.h"
static void HTTPPrint_crontmr(char *VarData, void *arg) static void HTTPPrint_crontmr(char *VarData, void *arg)
{ {
@ -46,6 +47,11 @@ static void HTTPPrint_crontmr(char *VarData, void *arg)
} }
} }
static void HTTPPrint_cronerr(char *VarData, void *arg)
{
snprintf(VarData, MAX_DYNVAR_LENGTH, GetCronError());
}
//Default string if not found handler //Default string if not found handler
static void HTTPPrint_DEF(char *VarData, void *arg) static void HTTPPrint_DEF(char *VarData, void *arg)
{ {
@ -60,6 +66,7 @@ static void HTTPPrint_status_fail(char *VarData, void *arg)
dyn_var_handler_t HANDLERS_ARRAY_CUST[] = { dyn_var_handler_t HANDLERS_ARRAY_CUST[] = {
{ "crontmr", sizeof("crontmr") - 1, &HTTPPrint_crontmr }, { "crontmr", sizeof("crontmr") - 1, &HTTPPrint_crontmr },
{ "cronerr", sizeof("cronerr") - 1, &HTTPPrint_cronerr },
/*ERROR report*/ /*ERROR report*/
{ "status_fail", sizeof("status_fail") - 1, &HTTPPrint_status_fail }, { "status_fail", sizeof("status_fail") - 1, &HTTPPrint_status_fail },