Turn off bat debug code

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

diff --git a/bacula/kernstodo b/bacula/kernstodo
index 2d2f3d7a063310a28b6e364a362d95dbce510921..094281543a39f5340af1957150a9d84178f4a42d 100644 (file)
--- a/bacula/kernstodo
+++ b/bacula/kernstodo
@@ -81,6 +81,12 @@ Professional Needs:
 Priority:
 ================
 
 Priority:
 ================
 

+- When reserving a device to read, check to see if the Volume
+  is already in use, if so wait.  Probably will need to pass the
+  Volume.  See bug #1313.  Create a regression test to simulate
+  this problem and see if VolumePollInterval fixes it. Possibly turn
+  it on by default.
+

 - Fix restore of acls and extended attributes to count ERROR
   messages and make errors non-fatal.
 - Put save/restore various platform acl/xattrs on a pointer to simplify
 - Fix restore of acls and extended attributes to count ERROR
   messages and make errors non-fatal.
 - Put save/restore various platform acl/xattrs on a pointer to simplify

diff --git a/bacula/src/qt-console/storage/storage.cpp b/bacula/src/qt-console/storage/storage.cpp
index 04b20ba5fecfa3540eee644304c14adf23a41b63..089b64817d4a621457679bb9f69a6c04f08c3a95 100644 (file)
--- a/bacula/src/qt-console/storage/storage.cpp
+++ b/bacula/src/qt-console/storage/storage.cpp
@@ -451,12 +451,16 @@ void Storage::settingsOpenStatus(QString &storage)
    settings.beginGroup("OpenOnExit");
    QString toRead = "StorageStatus_" + storage;
    if (settings.value(toRead) == 1) {
    settings.beginGroup("OpenOnExit");
    QString toRead = "StorageStatus_" + storage;
    if (settings.value(toRead) == 1) {

-      Pmsg1(000, "Do open Storage Status window for : %s\n", storage.toUtf8().data());
+      if (mainWin->m_sqlDebug) {
+         Pmsg1(000, "Do open Storage Status window for : %s\n", storage.toUtf8().data());
+      }

       new StorStat(storage, mainWin->getFromHash(this));
       setCurrent();
       mainWin->getFromHash(this)->setExpanded(true);
    } else {
       new StorStat(storage, mainWin->getFromHash(this));
       setCurrent();
       mainWin->getFromHash(this)->setExpanded(true);
    } else {

-      Pmsg1(000, "Do NOT open Storage Status window for : %s\n", storage.toUtf8().data());
+      if (mainWin->m_sqlDebug) {
+         Pmsg1(000, "Do NOT open Storage Status window for : %s\n", storage.toUtf8().data());
+      }

    }
    settings.endGroup();
 }
    }
    settings.endGroup();
 }