Attempt to correct timing problems with starting bat and obtaining

     lists. Maintain in_command counter to know when a list is coming.

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

diff --git a/bacula/src/dird/ua_cmds.c b/bacula/src/dird/ua_cmds.c
index 5577c3445b8dc1ddf1c564193d7cc54602078919..32a1aea5bdde2355ae3565df888330ec536f4605 100644 (file)
--- a/bacula/src/dird/ua_cmds.c
+++ b/bacula/src/dird/ua_cmds.c
@@ -193,6 +193,7 @@ bool do_a_command(UAContext *ua)
          }
          if (ua->api) user->signal(BNET_CMD_BEGIN);
          ok = (*commands[i].func)(ua, ua->cmd);   /* go execute command */
+         if (ua->api) user->signal(ok?BNET_CMD_OK:BNET_CMD_FAILED);
          found = true;
          break;
       }
@@ -201,7 +202,6 @@ bool do_a_command(UAContext *ua)
       ua->error_msg(_("%s: is an invalid command.\n"), ua->argk[0]);
       ok = false;
    }
-   if (ua->api) user->signal(ok?BNET_CMD_OK:BNET_CMD_FAILED);
    return ok;
 }
 

diff --git a/bacula/src/dird/ua_dotcmds.c b/bacula/src/dird/ua_dotcmds.c
index d09c60d378173e18f7f3d8a1704f90d2ba315bb9..462d8ed27a3dbafceb513990983a9b6a2e1f8183 100644 (file)
--- a/bacula/src/dird/ua_dotcmds.c
+++ b/bacula/src/dird/ua_dotcmds.c
@@ -1,7 +1,7 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2002-2008 Free Software Foundation Europe e.V.
+   Copyright (C) 2002-2009 Free Software Foundation Europe e.V.
 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
@@ -131,6 +131,7 @@ bool do_a_dot_command(UAContext *ua)
          ua->gui = true;
          if (ua->api) user->signal(BNET_CMD_BEGIN);
          ok = (*commands[i].func)(ua, ua->cmd);   /* go execute command */
+         if (ua->api) user->signal(ok?BNET_CMD_OK:BNET_CMD_FAILED);
          ua->gui = gui;
          found = true;
          break;
@@ -141,7 +142,6 @@ bool do_a_dot_command(UAContext *ua)
       ua->error_msg("%s", user->msg);
       ok = false;
    }
-   if (ua->api) user->signal(ok?BNET_CMD_OK:BNET_CMD_FAILED);
    return ok;
 }
 

diff --git a/bacula/src/qt-console/bcomm/dircomm.cpp b/bacula/src/qt-console/bcomm/dircomm.cpp
index c08ca6b115cd0344dd615317bce182d71c031919..67b10f99ee25a62abff6891fee056e2ee74a7481 100644 (file)
--- a/bacula/src/qt-console/bcomm/dircomm.cpp
+++ b/bacula/src/qt-console/bcomm/dircomm.cpp
@@ -1,7 +1,7 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2007-2008 Free Software Foundation Europe e.V.
+   Copyright (C) 2007-2009 Free Software Foundation Europe e.V.
 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
@@ -51,6 +51,7 @@ m_api_set(false)
    m_at_prompt = false;
    m_at_main_prompt = false;
    m_conn = conn;
+   m_in_command = 0;
 }
 
 DirComm::~DirComm()
@@ -301,12 +302,19 @@ int DirComm::read()
          if (mainWin->m_commDebug) Pmsg0(000, "CMD OK\n");
          m_at_prompt = false;
          m_at_main_prompt = false;
+//       Pmsg1(000, "before dec m_in_command=%d\n", m_in_command);
+         if (--m_in_command < 0) {
+//          Pmsg0(000, "m_in_command < 0\n");
+            m_in_command = 0;
+         }
          mainWin->set_status(_("Command completed ..."));
          continue;
       case BNET_CMD_BEGIN:
          if (mainWin->m_commDebug) Pmsg0(000, "CMD BEGIN\n");
          m_at_prompt = false;
          m_at_main_prompt = false;
+         m_in_command++;
+//       Pmsg1(000, "after inc m_in_command=%d\n", m_in_command);
          mainWin->set_status(_("Processing command ..."));
          continue;
       case BNET_MAIN_PROMPT:
@@ -325,6 +333,9 @@ int DirComm::read()
          break;
       case BNET_CMD_FAILED:
          if (mainWin->m_commDebug) Pmsg0(000, "CMD FAILED\n");
+         if (--m_in_command < 0) {
+            Pmsg0(000, "m_in_command < 0\n");
+         }
          mainWin->set_status(_("Command failed."));
          QApplication::restoreOverrideCursor();
          break;

diff --git a/bacula/src/qt-console/bcomm/dircomm.h b/bacula/src/qt-console/bcomm/dircomm.h
index 4f84a2a03f894d80a8c7ca5571c00a1b724465ff..a8e66aa6d09d80d1501725745aaa405a9f59f9b7 100644 (file)
--- a/bacula/src/qt-console/bcomm/dircomm.h
+++ b/bacula/src/qt-console/bcomm/dircomm.h
@@ -3,7 +3,7 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2007-2008 Free Software Foundation Europe e.V.
+   Copyright (C) 2007-2009 Free Software Foundation Europe e.V.
 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
@@ -64,6 +64,7 @@ public:
    char *msg();
    bool notify(bool enable); // enables/disables socket notification - returns the previous state
    bool is_notify_enabled() const;
+   bool is_in_command() const { return m_in_command > 0; };
    void terminate();
    bool connect_dir();                     
    int read(void);
@@ -77,6 +78,7 @@ private:
    BSOCK *m_sock;   
    bool m_at_prompt;
    bool m_at_main_prompt;
+   int  m_in_command;
    QSocketNotifier *m_notifier;
    bool m_api_set;
    int m_conn;

diff --git a/bacula/src/qt-console/console/console.cpp b/bacula/src/qt-console/console/console.cpp
index 8a14015091864bf8c397f7923340095886f9e72a..f17a735857e5bd27cffb46615b263d2da3eba872 100644 (file)
--- a/bacula/src/qt-console/console/console.cpp
+++ b/bacula/src/qt-console/console/console.cpp
@@ -1,7 +1,7 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2007-2008 Free Software Foundation Europe e.V.
+   Copyright (C) 2007-2009 Free Software Foundation Europe e.V.
 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
@@ -176,11 +176,12 @@ bool Console::dir_cmd(const char *cmd, QStringList &results)
       Pmsg2(000, "dir_cmd conn %i %s\n", conn, cmd);
    notify(conn, false);
    dircomm->write(cmd);
-   while ((stat = dircomm->read()) > 0) {
+   while ((stat = dircomm->read()) > 0 && dircomm->is_in_command()) {
       if (mainWin->m_displayAll) display_text(dircomm->msg());
       strip_trailing_junk(dircomm->msg());
       results << dircomm->msg();
    }
+   if (stat > 0 && mainWin->m_displayAll) display_text(dircomm->msg());
    notify(conn, true);
    discardToPrompt(conn);
    return true;              /* ***FIXME*** return any command error */

diff --git a/bacula/technotes-2.5 b/bacula/technotes-2.5
index f820150d3fdd85b5d0d55e86ea94833b18ff5dc2..f61d1f36287260eae2e686312710da4ad12e502f 100644 (file)
--- a/bacula/technotes-2.5
+++ b/bacula/technotes-2.5
@@ -49,6 +49,9 @@ Code to be completed before 3.0.0 is released:
 
 
 General:
+21Mar09
+Kes  Attempt to correct timing problems with starting bat and obtaining
+     lists. Maintain in_command counter to know when a list is coming.
 20Mar09
 kes  Convert seconds.seq separator into seconds_seq so that Bacula
      editing of the Job name from the full Job name works. This fixes