/*
Bacula® - The Network Backup Solution
- Copyright (C) 2007-2009 Free Software Foundation Europe e.V.
+ Copyright (C) 2007-2010 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.
This program is Free Software; you can redistribute it and/or
- modify it under the terms of version two of the GNU General Public
+ modify it under the terms of version three of the GNU Affero General Public
License as published by the Free Software Foundation and included
in the file LICENSE.
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- You should have received a copy of the GNU General Public License
+ You should have received a copy of the GNU Affero General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
Switzerland, email:ftf@fsfeurope.org.
*/
/*
- * Version $Id$
- *
* Console Class
*
* Kern Sibbald, January MMVII
void Console::poll_messages()
{
int conn;
- if (!availableDirComm(conn))
+
+ /* Do not poll if notifier off */
+ if (!mainWin->m_notify) {
return;
- DirComm *dircomm = m_dircommHash.value(conn);
+ }
+
+ /*
+ * Note if we call getDirComm here, we continuously consume
+ * file descriptors.
+ */
+ if (!findDirComm(conn)) { /* find a free DirComm */
+ return; /* try later */
+ }
+ DirComm *dircomm = m_dircommHash.value(conn);
if (mainWin->m_checkMessages && dircomm->m_at_main_prompt && hasFocus() && !mainWin->getWaitState()){
messagesPending(true);
dircomm->write(".messages");
m_textEdit = textEdit; /* our console screen */
if (dircomm->connect_dir()) {
- if (mainWin->m_connDebug)
+ if (mainWin->m_connDebug) {
Pmsg1(000, "DirComm 0 Seems to have Connected %s\n", m_dir->name());
+ }
beginNewCommand(0);
}
mainWin->set_status(_("Connected"));
void Console::populateLists(bool /*forcenew*/)
{
int conn;
- if (!availableDirComm(conn) && !newDirComm(conn)) {
- Pmsg1(000, "newDirComm Seems to Failed to create a connection for populateLists %s\n", m_dir->name());
- return;
+ if (!getDirComm(conn)) {
+ if (mainWin->m_connDebug) Pmsg0(000, "call newDirComm\n");
+ if (!newDirComm(conn)) {
+ Emsg1(M_ABORT, 0, "Failed to connect to %s for populateLists.\n", m_dir->name());
+ return;
+ }
}
populateLists(conn);
}
bool Console::dir_cmd(const char *cmd, QStringList &results)
{
int conn;
- if (availableDirComm(conn)) {
+ if (getDirComm(conn)) {
dir_cmd(conn, cmd, results);
return true;
} else {
- Pmsg1(000, "dir_cmd Seems to Failed to find a connection %s\n", m_dir->name());
+ Pmsg1(000, "dir_cmd failed to connect to %s\n", m_dir->name());
return false;
}
}
mainWin->waitEnter();
DirComm *dircomm = m_dircommHash.value(conn);
int stat;
+ bool prev_notify = mainWin->m_notify;
if (mainWin->m_connDebug) {
QString dbgmsg = QString("dir_cmd conn %1 %2 %3\n").arg(conn).arg(m_dir->name()).arg(cmd);
results << dircomm->msg();
}
if (stat > 0 && mainWin->m_displayAll) display_text(dircomm->msg());
- notify(conn, true);
+ if (prev_notify) {
+ notify(conn, true); /* turn it back on */
+ }
discardToPrompt(conn);
mainWin->waitExit();
- return true; /* ***FIXME*** return any command error */
+ return true; /* ***FIXME*** return any command error */
}
/*
bool Console::sql_cmd(QString &query, QStringList &results)
{
int conn;
- if (!availableDirComm(conn))
+ if (!getDirComm(conn)) {
return false;
+ }
return sql_cmd(conn, query.toUtf8().data(), results, true);
}
bool Console::sql_cmd(const char *query, QStringList &results)
{
int conn;
- if (!availableDirComm(conn))
+ if (!getDirComm(conn)) {
return false;
+ }
return sql_cmd(conn, query, results, true);
}
DirComm *dircomm = m_dircommHash.value(conn);
int stat;
POOL_MEM cmd(PM_MESSAGE);
+ bool prev_notify = mainWin->m_notify;
if (!is_connectedGui()) {
return false;
}
- if (mainWin->m_connDebug)
- Pmsg2(000, "sql_cmd conn %i %s\n", conn, query);
- if (donotify)
+ if (mainWin->m_connDebug) Pmsg2(000, "sql_cmd conn %i %s\n", conn, query);
+ if (donotify) {
dircomm->notify(false);
+ }
mainWin->waitEnter();
pm_strcpy(cmd, ".sql query=\"");
QString dum = dircomm->msg();
if ((dum.left(6) == "*None*")) doappend = false;
}
- if (doappend)
+ if (doappend) {
results << dircomm->msg();
+ }
first = false;
}
- if (donotify)
+ if (donotify && prev_notify) {
dircomm->notify(true);
+ }
discardToPrompt(conn);
mainWin->waitExit();
- return true; /* ***FIXME*** return any command error */
+ return !mainWin->isClosing(); /* return false if closing */
}
/*
int Console::write_dir(const char *msg)
{
int conn;
- if (availableDirComm(conn))
+ if (getDirComm(conn)) {
write_dir(conn, msg);
+ }
return conn;
}
int Console::write_dir(const char *msg, bool dowait)
{
int conn;
- if (availableDirComm(conn))
+ if (getDirComm(conn)) {
write_dir(conn, msg, dowait);
+ }
return conn;
}
QString scmd;
int stat;
char *def;
+ bool prev_notify = mainWin->m_notify;
+ bool rtn = false;
- if (donotify)
+ if (donotify) {
conn = notifyOff();
+ }
beginNewCommand(conn);
DirComm *dircomm = m_dircommHash.value(conn);
bool prevWaitState = mainWin->getWaitState();
continue;
}
}
-
- if (donotify)
- notify(conn, true);
- if (!prevWaitState)
- mainWin->waitExit();
- return true;
-
+ rtn = true;
+ /* Fall through wanted */
bail_out:
- if (donotify)
+ if (donotify && prev_notify) {
notify(conn, true);
- if (!prevWaitState)
+ }
+ if (!prevWaitState) {
mainWin->waitExit();
- return false;
+ }
+ return rtn;
}
}
}
}
- if (mainWin->m_commDebug) Pmsg2(000, "endDiscardToPrompt=%d %s\n", stat, m_dir->name());
+ if (mainWin->m_commDebug) {
+ Pmsg2(000, "endDiscardToPrompt conn=%i %s\n", conn, m_dir->name());
+ }
}
QString Console::returnFromPrompt(int conn)
int stat = 0;
text = "";
+ dircomm->read();
+ text += dircomm->msg();
if (mainWin->m_commDebug) Pmsg1(000, "returnFromPrompt %s\n", m_dir->name());
while (!dircomm->m_at_prompt) {
if ((stat=dircomm->read()) > 0) {
* m_console->notifiy(false);
*/
-/* dual purpose function to turn notify off and return an available connection */
+/* dual purpose function to turn notify off and return a connection */
int Console::notifyOff()
{
int conn = 0;
- if (availableDirComm(conn))
+ if (getDirComm(conn)) {
notify(conn, false);
+ }
return conn;
}
}
/*
- * Need an available connection. Check existing connections or create one
+ * Need a connection. Check existing connections or create one
*/
-bool Console::availableDirComm(int &conn)
+bool Console::getDirComm(int &conn)
{
- QHash<int, DirComm*>::const_iterator iter = m_dircommHash.constBegin();
- while (iter != m_dircommHash.constEnd()) {
- DirComm *dircomm = iter.value();
- if (dircomm->m_at_prompt && dircomm->m_at_main_prompt && dircomm->is_notify_enabled()) {
- conn = dircomm->m_conn;
- return true;
- }
- ++iter;
- }
- if (newDirComm(conn))
+ if (findDirComm(conn)) {
return true;
- else
- return false;
+ }
+ if (mainWin->m_connDebug) Pmsg0(000, "call newDirComm\n");
+ return newDirComm(conn);
}
/*
- * Need current connection.
+ * Try to find a free (unused but established) connection
+ * KES: Note, I think there is a problem here because for
+ * some reason, the notifier is often turned off on file
+ * descriptors that seem to me to be available. That means
+ * that we do not use a free descriptor and thus we will create
+ * a new connection that is maybe not necessary. Someone needs
+ * to look into whether or not notify() is correctly turned on
+ * when we are back at the command prompt and idle.
+ *
*/
-bool Console::currentDirComm(int &conn)
+bool Console::findDirComm(int &conn)
{
+ int i = 1;
QHash<int, DirComm*>::const_iterator iter = m_dircommHash.constBegin();
while (iter != m_dircommHash.constEnd()) {
DirComm *dircomm = iter.value();
- if (dircomm->m_at_prompt && !dircomm->m_at_main_prompt && dircomm->is_notify_enabled()) {
+ if (dircomm->m_at_prompt && dircomm->m_at_main_prompt && dircomm->is_notify_enabled()) {
conn = dircomm->m_conn;
return true;
}
+ if (mainWin->m_connDebug) {
+ Pmsg4(000, "currentDirComm=%d at_prompt=%d at_main=%d && notify=%d\n",
+ i, dircomm->m_at_prompt, dircomm->m_at_main_prompt, dircomm->is_notify_enabled());
+ i++;
+ }
++iter;
}
return false;
*/
bool Console::newDirComm(int &conn)
{
- m_dircommCounter += 1;
- conn = m_dircommCounter;
- if (mainWin->m_connDebug)
- Pmsg2(000, "DirComm %i About to Create and Connect %s\n", m_dircommCounter, m_dir->name());
+ m_dircommCounter++;
+ if (mainWin->m_connDebug) {
+ Pmsg2(000, "newDirComm=%i to: %s\n", m_dircommCounter, m_dir->name());
+ }
DirComm *dircomm = new DirComm(this, m_dircommCounter);
m_dircommHash.insert(m_dircommCounter, dircomm);
bool success = dircomm->connect_dir();
if (mainWin->m_connDebug) {
- if (success)
- Pmsg2(000, "DirComm %i Connected %s\n", conn, m_dir->name());
- else
- Pmsg2(000, "DirComm %i NOT Connected %s\n", conn, m_dir->name());
+ if (success) {
+ Pmsg2(000, "newDirComm=%i Connected %s\n", m_dircommCounter, m_dir->name());
+ } else {
+ Emsg2(M_ERROR, 0, "DirComm=%i. Unable to connect to %s\n",
+ m_dircommCounter, m_dir->name());
+ }
+ }
+ if (!success) {
+ m_dircommHash.remove(m_dircommCounter);
+ delete dircomm;
+ m_dircommCounter--;
}
+ conn = m_dircommCounter;
return success;
}
projects / bacula / bacula / blobdiff