From: <ke...@us...> - 2008-02-03 16:23:39
|
Revision: 6363 http://bacula.svn.sourceforge.net/bacula/?rev=6363&view=rev Author: kerns Date: 2008-02-03 08:23:37 -0800 (Sun, 03 Feb 2008) Log Message: ----------- Update plugins Modified Paths: -------------- trunk/bacula/src/filed/fd-plugins.c trunk/bacula/src/filed/job.c trunk/bacula/src/lib/plugins.c trunk/bacula/src/plugins/fd/example-plugin-fd.c Modified: trunk/bacula/src/filed/fd-plugins.c =================================================================== --- trunk/bacula/src/filed/fd-plugins.c 2008-02-03 13:51:07 UTC (rev 6362) +++ trunk/bacula/src/filed/fd-plugins.c 2008-02-03 16:23:37 UTC (rev 6363) @@ -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"; Modified: trunk/bacula/src/filed/job.c =================================================================== --- trunk/bacula/src/filed/job.c 2008-02-03 13:51:07 UTC (rev 6362) +++ trunk/bacula/src/filed/job.c 2008-02-03 16:23:37 UTC (rev 6363) @@ -465,7 +465,8 @@ 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); } Modified: trunk/bacula/src/lib/plugins.c =================================================================== --- trunk/bacula/src/lib/plugins.c 2008-02-03 13:51:07 UTC (rev 6362) +++ trunk/bacula/src/lib/plugins.c 2008-02-03 16:23:37 UTC (rev 6363) @@ -105,7 +105,7 @@ 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) { Modified: trunk/bacula/src/plugins/fd/example-plugin-fd.c =================================================================== --- trunk/bacula/src/plugins/fd/example-plugin-fd.c 2008-02-03 13:51:07 UTC (rev 6362) +++ trunk/bacula/src/plugins/fd/example-plugin-fd.c 2008-02-03 16:23:37 UTC (rev 6363) @@ -101,7 +101,7 @@ { 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 @@ { 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 @@ 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; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |