Adds immediate migration results in progress
This commit is contained in:
2102 files changed
+17482
-15071
No files matched your search
@@ -40,7 +40,7 @@ bool CopyDatabase::doCopy()
|
||||
{
|
||||
if (!runPgDump())
|
||||
{
|
||||
ERROR_LOG() << "Error running pg_dump";
|
||||
ERROR_LOG(m_logger) << "Error running pg_dump";
|
||||
emit copyDbFailed();
|
||||
return false;
|
||||
}
|
||||
@@ -74,7 +74,7 @@ void CopyDatabase::onDropDbFinished(int exitCode, QProcess::ExitStatus exitStatu
|
||||
|
||||
if (exitCode > 0)
|
||||
{
|
||||
ERROR_LOG() << "DropDb failed";
|
||||
ERROR_LOG(m_logger) << "DropDb failed";
|
||||
emit dropDatabaseFailed();
|
||||
return;
|
||||
}
|
||||
@@ -129,7 +129,7 @@ void CopyDatabase::onCreateDbFinished(int exitCode, QProcess::ExitStatus exitSta
|
||||
|
||||
if (exitCode > 0)
|
||||
{
|
||||
ERROR_LOG() << "CreateDB failed";
|
||||
ERROR_LOG(m_logger) << "CreateDB failed";
|
||||
emit copyDbFailed();
|
||||
return;
|
||||
}
|
||||
@@ -179,7 +179,7 @@ void CopyDatabase::onPgLoadFinished(int exitCode, QProcess::ExitStatus exitStatu
|
||||
|
||||
if (exitCode > 0)
|
||||
{
|
||||
ERROR_LOG() << "Loading db failed";
|
||||
ERROR_LOG(m_logger) << "Loading db failed";
|
||||
emit copyDbFailed();
|
||||
return;
|
||||
}
|
||||
@@ -207,7 +207,7 @@ void CopyDatabase::onPgSetGrantFinished(int exitCode, QProcess::ExitStatus exitS
|
||||
|
||||
if (exitCode > 0)
|
||||
{
|
||||
ERROR_LOG() << "Set grants to ets_admin failed";
|
||||
ERROR_LOG(m_logger) << "Set grants to ets_admin failed";
|
||||
emit copyDbFailed();
|
||||
return;
|
||||
}
|
||||
@@ -241,7 +241,7 @@ void CopyDatabase::handleProcFinished(int exitCode, QProcess::ExitStatus exitSta
|
||||
if (!out.isEmpty())
|
||||
out += '\n';
|
||||
out += m_proc->readAllStandardOutput();
|
||||
ERROR_LOG() << "Process finished - exitCode: " << exitCode << ", exitStatus = " << exitStatus << ", " << out;
|
||||
ERROR_LOG(m_logger) << "Process finished - exitCode: " << exitCode << ", exitStatus = " << exitStatus << ", " << out;
|
||||
}
|
||||
m_proc->disconnect(this);
|
||||
m_proc->deleteLater();
|
||||
@@ -250,7 +250,7 @@ void CopyDatabase::handleProcFinished(int exitCode, QProcess::ExitStatus exitSta
|
||||
|
||||
void CopyDatabase::onErrorOccured(QProcess::ProcessError error)
|
||||
{
|
||||
ERROR_LOG() << "error: " << error << ", " << m_proc->readAllStandardOutput() << ", " << m_proc->readAllStandardError();
|
||||
ERROR_LOG(m_logger) << "error: " << error << ", " << m_proc->readAllStandardOutput() << ", " << m_proc->readAllStandardError();
|
||||
}
|
||||
|
||||
QString CopyDatabase::getDumpFile() const
|
||||
@@ -263,7 +263,7 @@ QString CopyDatabase::executablePath(const QString &program)
|
||||
QString errStr;
|
||||
const QString ret = NGL::postgresExecutablePath(program, errStr);
|
||||
if (!errStr.isEmpty())
|
||||
WARNING_LOG() << errStr;
|
||||
WARNING_LOG(m_logger) << errStr;
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user