Update plugins

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@6363 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/src/filed/fd-plugins.c b/bacula/src/filed/fd-plugins.c
index 5fd41338db1c7b705bf9713f9da6e01638e75348..c503da898d5435d2234c3e084b5735dedd23ee10 100644 (file)
--- a/bacula/src/filed/fd-plugins.c
+++ b/bacula/src/filed/fd-plugins.c
@@ -35,7 +35,7 @@
 #include "jcr.h"
 #include "fd-plugins.h"
 
-const int dbglvl = 0;
+const int dbglvl = 50;
 const char *plugin_type = "-fd.so";
 
 

diff --git a/bacula/src/filed/job.c b/bacula/src/filed/job.c
index 6617d6a58b2db6bffdc7a86973e55805a339dec4..6965a863a7edbcef93aa8b2e7e31110e5f9ebb30 100644 (file)
--- a/bacula/src/filed/job.c
+++ b/bacula/src/filed/job.c
@@ -465,7 +465,8 @@ static int job_cmd(JCR *jcr)
    jcr->sd_auth_key = bstrdup(sd_auth_key);
    free_pool_memory(sd_auth_key);
    Dmsg2(120, "JobId=%d Auth=%s\n", jcr->JobId, jcr->sd_auth_key);
-   generate_plugin_event(jcr, bEventJobStart, (void *)dir->msg);
+   Mmsg(jcr->errmsg, "JobId=%d Job=%s", jcr->JobId, jcr->Job);
+   generate_plugin_event(jcr, bEventJobStart, (void *)jcr->errmsg);
    return dir->fsend(OKjob, VERSION, LSMDATE, HOST_OS, DISTNAME, DISTVER);
 }
 

diff --git a/bacula/src/lib/plugins.c b/bacula/src/lib/plugins.c
index c67228e6fd6feb33071098f435d777166c4869ad..81b7cfcb2a96a47d8ff00a09c5c0e741dcbbe3da 100644 (file)
--- a/bacula/src/lib/plugins.c
+++ b/bacula/src/lib/plugins.c
@@ -105,7 +105,7 @@ bool load_plugins(void *binfo, void *bfuncs, const char *plugin_dir, const char
       if (len < type_len+1 || strcmp(&result->d_name[len-type_len], type) != 0) {
          continue;
       }
-      printf("Got: name=%s len=%d\n", result->d_name, len);
+      Dmsg2(000, "Loaded plugin: name=%s len=%d\n", result->d_name, len);
        
       pm_strcpy(fname, plugin_dir);
       if (need_slash) {

diff --git a/bacula/src/plugins/fd/example-plugin-fd.c b/bacula/src/plugins/fd/example-plugin-fd.c
index 044b7594dbe96cf482f571a1877e4ebdd43d9047..7599c4d9c75e514827681c368db624383708b15e 100644 (file)
--- a/bacula/src/plugins/fd/example-plugin-fd.c
+++ b/bacula/src/plugins/fd/example-plugin-fd.c
@@ -101,7 +101,7 @@ static bpError newPlugin(bpContext *ctx)
 {
    int JobId = 0;
    bfuncs->getBaculaValue(ctx, bVarJobId, (void *)&JobId);
-   printf("plugin: newPlugin JobId=%d\n", JobId);
+// printf("plugin: newPlugin JobId=%d\n", JobId);
    bfuncs->registerBaculaEvents(ctx, 1, 2, 0);
    return 0;
 }
@@ -110,19 +110,19 @@ static bpError freePlugin(bpContext *ctx)
 {
    int JobId = 0;
    bfuncs->getBaculaValue(ctx, bVarJobId, (void *)&JobId);
-   printf("plugin: freePlugin JobId=%d\n", JobId);
+// printf("plugin: freePlugin JobId=%d\n", JobId);
    return 0;
 }
 
 static bpError getPluginValue(bpContext *ctx, pVariable var, void *value) 
 {
-   printf("plugin: getPluginValue var=%d\n", var);
+// printf("plugin: getPluginValue var=%d\n", var);
    return 0;
 }
 
 static bpError setPluginValue(bpContext *ctx, pVariable var, void *value) 
 {
-   printf("plugin: setPluginValue var=%d\n", var);
+// printf("plugin: setPluginValue var=%d\n", var);
    return 0;
 }
 
@@ -131,16 +131,31 @@ static bpError handlePluginEvent(bpContext *ctx, bEvent *event, void *value)
    char *name;
    switch (event->eventType) {
    case bEventJobStart:
-      printf("plugin: HandleEvent JobStart\n");
+      printf("plugin: JobStart=%s\n", (char *)value);
       break;
    case bEventJobEnd:
-      printf("plugin: HandleEvent JobEnd\n");
+      printf("plugin: JobEnd\n");
+      break;
+   case bEventBackupStart:
+      printf("plugin: BackupStart\n");
+      break;
+   case bEventBackupEnd:
+      printf("plugin: BackupEnd\n");
+      break;
+   case bEventPluginCommand:
+      printf("plugin: command=%s\n", (char *)value);
+      break;
+   case bEventLevel:
+      printf("plugin: JobLevel=%c %d\n", (int)value, (int)value);
+      break;
+   case bEventSince:
+      printf("plugin: since=%d\n", (int)value);
       break;
    }
    bfuncs->getBaculaValue(ctx, bVarFDName, (void *)&name);
-   printf("FD Name=%s\n", name);
-   bfuncs->JobMessage(ctx, __FILE__, __LINE__, 1, 0, "JobMesssage message");
-   bfuncs->DebugMessage(ctx, __FILE__, __LINE__, 1, "DebugMesssage message");
+// printf("FD Name=%s\n", name);
+// bfuncs->JobMessage(ctx, __FILE__, __LINE__, 1, 0, "JobMesssage message");
+// bfuncs->DebugMessage(ctx, __FILE__, __LINE__, 1, "DebugMesssage message");
    return 0;
 }