From e0b37adc520ddd7f71dd9daf7320961811c22f6a Mon Sep 17 00:00:00 2001 From: Jeffrey Townsend Date: Fri, 8 Apr 2016 21:05:04 +0000 Subject: [PATCH] AIM Daemon API changes. --- .../base/any/faultd/src/module/src/faultd_main.c | 14 +++++++------- .../base/any/onlp/src/onlp/module/src/onlp_main.c | 12 ++++++------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/packages/base/any/faultd/src/module/src/faultd_main.c b/packages/base/any/faultd/src/module/src/faultd_main.c index d1b5a581..a3022969 100644 --- a/packages/base/any/faultd/src/module/src/faultd_main.c +++ b/packages/base/any/faultd/src/module/src/faultd_main.c @@ -1,22 +1,22 @@ /**************************************************************************//** * * - * - * Copyright 2013, 2014 BigSwitch Networks, Inc. - * + * + * Copyright 2013, 2014 BigSwitch Networks, Inc. + * * Licensed under the Eclipse Public License, Version 1.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.eclipse.org/legal/epl-v10.html - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, * either express or implied. See the License for the specific * language governing permissions and limitations under the * License. - * + * * * *****************************************************************************/ @@ -150,7 +150,7 @@ faultd_main(int argc, char* argv[]) aim_daemon_config_t config; memset(&config, 0, sizeof(config)); - aim_daemon_restart_config_init(&rconfig, 1, 1); + aim_daemon_restart_config_init(&rconfig, 1, 1, argv); AIM_BITMAP_CLR(&rconfig.signal_restarts, SIGTERM); AIM_BITMAP_CLR(&rconfig.signal_restarts, SIGKILL); rconfig.maximum_restarts=0; diff --git a/packages/base/any/onlp/src/onlp/module/src/onlp_main.c b/packages/base/any/onlp/src/onlp/module/src/onlp_main.c index 276e3bc6..f20b1f0b 100644 --- a/packages/base/any/onlp/src/onlp/module/src/onlp_main.c +++ b/packages/base/any/onlp/src/onlp/module/src/onlp_main.c @@ -31,7 +31,7 @@ #include #include -static void platform_manager_daemon__(const char* pidfile); +static void platform_manager_daemon__(const char* pidfile, char** argv); /** * Human-readable SFP inventory. @@ -246,7 +246,7 @@ onlpdump_main(int argc, char* argv[]) onlp_init(); if(M) { - platform_manager_daemon__(pidfile); + platform_manager_daemon__(pidfile, argv); exit(0); } @@ -361,14 +361,14 @@ sighandler__(int signal) } static void -platform_manager_daemon__(const char* pidfile) +platform_manager_daemon__(const char* pidfile, char** argv) { aim_pvs_t* aim_pvs_syslog = NULL; aim_daemon_restart_config_t rconfig; aim_daemon_config_t config; memset(&config, 0, sizeof(config)); - aim_daemon_restart_config_init(&rconfig, 1, 1); + aim_daemon_restart_config_init(&rconfig, 1, 1, argv); AIM_BITMAP_CLR(&rconfig.signal_restarts, SIGTERM); AIM_BITMAP_CLR(&rconfig.exit_restarts, 0); rconfig.maximum_restarts=50; @@ -412,9 +412,9 @@ platform_manager_daemon__(const char* pidfile) #else static void -platform_manager_daemon__(const char* pidfile) +platform_manager_daemon__(const char* pidfile, char** argv) { - fprintf(stderr, "Daemon mode not supported in this build."); + fprintf(stderr, "Daemon mode not supported in this build.\n"); exit(1); } #endif