X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-supervision.c;h=f1024c3cba220cf16761fb057e79565a16674ac7;hb=refs%2Fchanges%2F59%2F14359%2F1;hp=97595245f589dc9103506a83fac84a12c7a81cb1;hpb=ac7a95223a6314cca6250495ea59c3cf7e46e89e;p=src%2Fapp-framework-binder.git diff --git a/src/afb-supervision.c b/src/afb-supervision.c index 97595245..f1024c3c 100644 --- a/src/afb-supervision.c +++ b/src/afb-supervision.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016, 2017 "IoT.bzh" + * Copyright (C) 2016, 2017, 2018 "IoT.bzh" * Author José Bollo * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -51,11 +51,11 @@ extern struct afb_config *main_config; /* api and apiset name */ -static const char supervision_apiname[] = AFS_SURPERVISION_APINAME; -static const char supervisor_apiname[] = AFS_SURPERVISOR_APINAME; +static const char supervision_apiname[] = AFS_SUPERVISION_APINAME; +static const char supervisor_apiname[] = AFS_SUPERVISOR_APINAME; /* path of the supervision socket */ -static const char supervisor_socket_path[] = AFS_SURPERVISION_SOCKET; +static const char supervisor_socket_path[] = AFS_SUPERVISION_SOCKET; /* mutual exclusion */ static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; @@ -162,7 +162,7 @@ static void try_connect_supervisor() goto end; } - /* negociation */ + /* negotiation */ do { srd = read(fd, &initiator, sizeof initiator); } while(srd < 0 && errno == EINTR); if (srd < 0) { NOTICE("Can't read supervisor %s: %m", supervisor_socket_path); @@ -176,7 +176,7 @@ static void try_connect_supervisor() ERROR("Bad interface of supervisor %s", supervisor_socket_path); goto end2; } - if (strcmp(initiator.interface, AFS_SURPERVISION_INTERFACE_1)) { + if (strcmp(initiator.interface, AFS_SUPERVISION_INTERFACE_1)) { ERROR("Unknown interface %s for supervisor %s", initiator.interface, supervisor_socket_path); goto end2; } @@ -232,7 +232,7 @@ static void on_sighup(int signum) } /** - * initalize the supervision + * initialize the supervision */ int afb_supervision_init() { @@ -316,7 +316,7 @@ static void on_supervision_call(void *closure, struct afb_xreq *xreq) i = 0; if (wrap_json_unpack(args, "i", &i)) wrap_json_unpack(args, "{si}", "code", &i); - ERROR("existing from supervision with code %d -> %d", i, i & 127); + ERROR("exiting from supervision with code %d -> %d", i, i & 127); exit(i & 127); break; case Sclose: