manager-failover.diff

Implement a second failover for failure with a specific message. - Yoann VANDOORSELAERE, 07/12/2007 10:52 AM

             if ( ret < 0 )
                     prelude_log(PRELUDE_LOG_WARN, "could not insert message into database: %s.\n", preludedb_strerror(ret));
             if ( prelude_error_get_code(ret) == PRELUDEDB_ERROR_CONNECTION )
                     ret = MANAGER_REPORT_PLUGIN_FAILURE_GLOBAL;
             else
                     ret = MANAGER_REPORT_PLUGIN_FAILURE_SINGLE;
             return ret;
+    }

     * This file is part of the Prelude-Manager program.
+    *
     * This program is free software; you can redistribute it and/or modify
     * it under the terms of the GNU General Public License as published by
     * it under the terms of the GNU General Public License as published by
     * the Free Software Foundation; either version 2, or (at your option)
     * any later version.
+    *
-...
     /*
      * Report plugin entry structure.
      */
     #define MANAGER_REPORT_PLUGIN_FAILURE_GLOBAL  -1
     #define MANAGER_REPORT_PLUGIN_FAILURE_SINGLE  -2
     typedef struct {
             PRELUDE_PLUGIN_GENERIC;
             int (*run)(prelude_plugin_instance_t *pi, idmef_message_t *message);

     typedef struct {
             int failover_enabled;
             prelude_bool_t failover_enabled;
             prelude_timer_t timer;
             prelude_failover_t *failover;
             prelude_failover_t *failed_failover;
     } plugin_failover_t;
     static int report_plugin_run_single(prelude_plugin_instance_t *pi, plugin_failover_t *pf, idmef_message_t *idmef);
     static void get_failover_filename(prelude_plugin_instance_t *pi, char *buf, size_t size)
+    {
             prelude_plugin_generic_t *plugin = prelude_plugin_instance_get_plugin(pi);
-...
                     if ( ret < 0 )
                             break;
                     ret = prelude_plugin_run(pi, manager_report_plugin_t, run, pi, idmef);
                     if ( ret < 0 && pf )
                     ret = report_plugin_run_single(pi, pf, idmef);
                     if ( ret < 0 && ret != MANAGER_REPORT_PLUGIN_FAILURE_SINGLE )
                             break;
                     prelude_msg_destroy(msg);
-...
                     text = "failed recovering";
             else {
                     text = "recovered";
                     pf->failover_enabled = 0;
                     pf->failover_enabled = FALSE;
+            }
             prelude_log(PRELUDE_LOG_WARN, "Plugin %s[%s]: %s from failover: %u/%u message flushed (%" PRELUDE_PRIu64 " bytes).\n",
-...
             get_failover_filename(pi, filename, sizeof(filename));
             if ( ! prelude_plugin_instance_has_commit_func(pi) ) {
                     prelude_log(PRELUDE_LOG_WARN, "plugin %s doesn't support failover.\n", plugin->name);
                     prelude_log(PRELUDE_LOG_WARN, "plugin %s does not support failover.\n", plugin->name);
                     return -1;
+            }
-...
                     return -1;
+            }
             snprintf(filename + strlen(filename), sizeof(filename) - strlen(filename), "/invalid");
             ret = prelude_failover_new(&pf->failed_failover, filename);
             if ( ret < 0 ) {
                     prelude_perror(ret, "could not create failover object in %s", filename);
                     free(pf);
                     return -1;
+            }
             prelude_plugin_instance_set_data(pi, pf);
             try_recovering_from_failover(pi, pf);
-...
     static void failover_init(prelude_plugin_generic_t *pg, prelude_plugin_instance_t *pi, plugin_failover_t *pf)
     static void failover_init(prelude_plugin_instance_t *pi, plugin_failover_t *pf)
+    {
             pf->failover_enabled = 1;
             prelude_plugin_generic_t *pg = prelude_plugin_instance_get_plugin(pi);
             pf->failover_enabled = TRUE;
             prelude_log(PRELUDE_LOG_WARN, "Plugin %s[%s]: failure. Enabling failover.\n",
                         pg->name, prelude_plugin_instance_get_name(pi));
-...
     static int save_msgbuf(prelude_msgbuf_t *msgbuf, prelude_msg_t *msg)
+    {
             int ret;
             plugin_failover_t *pf = prelude_msgbuf_get_data(msgbuf);
             prelude_failover_t *pf = prelude_msgbuf_get_data(msgbuf);
             ret = prelude_failover_save_msg(pf->failover, msg);
             ret = prelude_failover_save_msg(pf, msg);
             if ( ret < 0 )
                     prelude_perror(ret, "error saving message to disk");
-...
     static void save_idmef_message(plugin_failover_t *pf, idmef_message_t *msg)
     static void save_idmef_message(prelude_failover_t *pf, idmef_message_t *msg)
+    {
             /*
              * this is a message we generated ourself...
-...
     static int report_plugin_run_single(prelude_plugin_instance_t *pi, plugin_failover_t *pf, idmef_message_t *idmef)
+    {
             int ret;
             ret = prelude_plugin_run(pi, manager_report_plugin_t, run, pi, idmef);
             if ( ret < 0 && pf ) {
                     if ( ret == MANAGER_REPORT_PLUGIN_FAILURE_SINGLE )
                             save_idmef_message(pf->failed_failover, idmef);
                     else {
                             failover_init(pi, pf);
                             save_idmef_message(pf->failover, idmef);
+                    }
+            }
             return ret;
+    }
     /*
      * Start all plugins of kind 'list'.
-...
                             continue;
                     if ( pf && pf->failover_enabled ) {
                             save_idmef_message(pf, idmef);
                             save_idmef_message(pf->failover, idmef);
                             continue;
+                    }
                     ret = prelude_plugin_run(pi, manager_report_plugin_t, run, pi, idmef);
                     if ( ret < 0 && pf ) {
                             failover_init(pg, pi, pf);
                             save_idmef_message(pf, idmef);
+                    }
+            }
                     report_plugin_run_single(pi, pf, idmef);
+             }
+    }

Project

General

Profile

manager-failover.diff