|
From: <jc...@us...> - 2008-10-20 16:41:55
|
Revision: 1114
http://omc.svn.sourceforge.net/omc/?rev=1114&view=rev
Author: jcarey
Date: 2008-10-20 16:41:46 +0000 (Mon, 20 Oct 2008)
Log Message:
-----------
Switch some printfs over to debug out so they could be handled by the VM_BUILDER_DEBUG env variable mechanism
Modified Paths:
--------------
contrib/xen-vm-builder/trunk/src/providers/vm-builder/builder-service.c
contrib/xen-vm-builder/trunk/src/providers/vm-builder/vmbuilder-util.c
contrib/xen-vm-builder/trunk/src/providers/vm-builder/vmbuilder-util.h
contrib/xen-vm-builder/trunk/src/providers/vm-builder/vmcreation-data.c
Modified: contrib/xen-vm-builder/trunk/src/providers/vm-builder/builder-service.c
===================================================================
--- contrib/xen-vm-builder/trunk/src/providers/vm-builder/builder-service.c 2008-10-19 20:57:27 UTC (rev 1113)
+++ contrib/xen-vm-builder/trunk/src/providers/vm-builder/builder-service.c 2008-10-20 16:41:46 UTC (rev 1114)
@@ -934,13 +934,11 @@
cmpiutilStrArray_destroy(vm_settings);
/* Execute vm-install with the constructed command line */
-#ifdef XEN_VMBUILDER_DEBUG
- printf("Executing:\n");
+ DEBUGOUT("Executing:\n");
for(i = 0; pstra->strs[i]; i++) {
- printf("%s ", pstra->strs[i]);
+ DEBUGOUT("%s ", pstra->strs[i]);
}
- printf("\n");
-#endif
+ DEBUGOUT("\n");
output = NULL;
DEBUGOUT("Calling vm-install...\n");
@@ -959,11 +957,9 @@
} else {
prv->uint32 = (CMPIUint32)WEXITSTATUS(cc);
DEBUGOUT("vm-install failed status: %u\n", prv->uint32);
-#ifdef XEN_VMBUILDER_DEBUG
if(output) {
- printf("vm-install output: %s\n", output);
+ DEBUGOUT("vm-install output: %s\n", output);
}
-#endif
}
} else {
strerror_r(errno, wkbfr, sizeof(wkbfr));
Modified: contrib/xen-vm-builder/trunk/src/providers/vm-builder/vmbuilder-util.c
===================================================================
--- contrib/xen-vm-builder/trunk/src/providers/vm-builder/vmbuilder-util.c 2008-10-19 20:57:27 UTC (rev 1113)
+++ contrib/xen-vm-builder/trunk/src/providers/vm-builder/vmbuilder-util.c 2008-10-20 16:41:46 UTC (rev 1114)
@@ -19,6 +19,13 @@
#endif
/******************************************************************************/
+int
+is_debug()
+{
+ return _is_debug;
+}
+
+/******************************************************************************/
void
set_debug_for_env()
{
Modified: contrib/xen-vm-builder/trunk/src/providers/vm-builder/vmbuilder-util.h
===================================================================
--- contrib/xen-vm-builder/trunk/src/providers/vm-builder/vmbuilder-util.h 2008-10-19 20:57:27 UTC (rev 1113)
+++ contrib/xen-vm-builder/trunk/src/providers/vm-builder/vmbuilder-util.h 2008-10-20 16:41:46 UTC (rev 1114)
@@ -24,6 +24,7 @@
void set_dt_prop(const CMPIBroker* broker, VMBDBCtx dbctx, int col_ndx,
CMPIInstance* instance, const char* prop_name, CMPIBoolean isInterval);
char** get_job_names();
+int is_debug();
void set_debug_for_env();
void vmbuilder_debug_out(const char* fmt, ...);
Modified: contrib/xen-vm-builder/trunk/src/providers/vm-builder/vmcreation-data.c
===================================================================
--- contrib/xen-vm-builder/trunk/src/providers/vm-builder/vmcreation-data.c 2008-10-19 20:57:27 UTC (rev 1113)
+++ contrib/xen-vm-builder/trunk/src/providers/vm-builder/vmcreation-data.c 2008-10-20 16:41:46 UTC (rev 1114)
@@ -1226,7 +1226,7 @@
}
cmpiutilStrBuf_cat(pstrbuf, ");", 0);
- printf("SQL: %s\n", pstrbuf->bfr);
+ DEBUGOUT("SQL: %s\n", pstrbuf->bfr);
if (db_exec(pstrbuf->bfr, wkbfr, sizeof(wkbfr)) < 0LL) {
DEBUGOUT("CreateInstance(): failed inserting record into "
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|