Skip to content

Commit 98fa2df

Browse files
Deomid Ryabkovcesantabot
authored andcommitted
Don't print error if init.js or app.js does not exist
CL: mjs: Don't print error if init.js or app.js does not exist PUBLISHED_FROM=aaf6abd3af9ef66282a3a0528e3af916f906fbba
1 parent ce86d41 commit 98fa2df

File tree

1 file changed

+11
-8
lines changed

1 file changed

+11
-8
lines changed

src/mos_mjs.c

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,15 @@
3333

3434
struct mjs *mjs = NULL;
3535

36+
static void run_if_exists(const char *fname) {
37+
struct stat st;
38+
if (stat(fname, &st) != 0) return;
39+
LOG(LL_DEBUG, ("Trying to run %s...", fname));
40+
if (mjs_exec_file(mjs, fname, NULL) != MJS_OK) {
41+
mjs_print_error(mjs, stderr, NULL, 1 /* print_stack_trace */);
42+
}
43+
}
44+
3645
/*
3746
* Runs when all initialization (all libs + app) is done
3847
* Execute two files:
@@ -48,14 +57,8 @@ static void s_init_done_handler(int ev, void *ev_data, void *userdata) {
4857
int mem1, mem2;
4958

5059
mem1 = mgos_get_free_heap_size();
51-
LOG(LL_DEBUG, ("Trying to run init.js ..."));
52-
if (mjs_exec_file(mjs, "init.js", NULL) != MJS_OK) {
53-
mjs_print_error(mjs, stdout, NULL, 1 /* print_stack_trace */);
54-
}
55-
LOG(LL_DEBUG, ("Trying to run app.js ..."));
56-
if (mjs_exec_file(mjs, "app.js", NULL) != MJS_OK) {
57-
mjs_print_error(mjs, stdout, NULL, 1);
58-
}
60+
run_if_exists("init.js");
61+
run_if_exists("app.js");
5962
mem2 = mgos_get_free_heap_size();
6063
LOG(LL_DEBUG, ("mJS RAM stat: before user code: %d after: %d", mem1, mem2));
6164

0 commit comments

Comments
 (0)