1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/node/ synced 2025-03-09 00:00:00 +01:00

Merge branch 'develop' of git.rwth-aachen.de:/acs/public/villas/VILLASnode into develop

This commit is contained in:
root 2019-04-15 13:09:33 +02:00
commit 136c21bd8d
3 changed files with 3 additions and 3 deletions

View file

@ -105,7 +105,7 @@ int test_rtt_prepare(struct node *n)
max_values = c->values;
c->filename_formatted = (char *) alloc(NAME_MAX);
strftime(c->filename_formatted, NAME_MAX, c->filename, &tm);
}

View file

@ -151,7 +151,7 @@ int path_source_read(struct path_source *ps, struct path *p, int i)
#endif
if (p->mask.test(i)) {
/* Check if we received an update from all nodes/ */
/* Check if we received an update from all nodes */
if ((p->mode == PATH_MODE_ANY) ||
(p->mode == PATH_MODE_ALL && p->mask == p->received)) {
path_destination_enqueue(p, muxed_smps, toenqueue);

View file

@ -259,7 +259,7 @@ void Web::start()
logger->info("Starting sub-system: htdocs={}", htdocs.c_str());
/* update web root of mount point */
mounts[1].origin = htdocs.c_str();
mounts[ARRAY_LEN(mounts)-1].origin = htdocs.c_str();
context = lws_create_context(&ctx_info);
if (context == nullptr)