AZEN-SGG/amnezia-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Filter ssh output

Browse source
This commit is contained in:
pokamest 2021-01-03 15:37:03 +03:00
parent f68b22d468
commit a4ad07959f
1 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
client/core/servercontroller.cpp
View file

@ -51,11 +51,17 @@ bool ServerController::runScript(const SshConnectionParameters &sshParams, QStri
}); });
QObject::connect(proc.data(), &SshRemoteProcess::readyReadStandardOutput, [proc](){ QObject::connect(proc.data(), &SshRemoteProcess::readyReadStandardOutput, [proc](){
qDebug().noquote() << proc->readAllStandardOutput(); QString s = proc->readAllStandardOutput();
if (s != "." && !s.isEmpty()) {
qDebug().noquote() << s;
}
}); });
QObject::connect(proc.data(), &SshRemoteProcess::readyReadStandardError, [proc](){ QObject::connect(proc.data(), &SshRemoteProcess::readyReadStandardError, [proc](){
qDebug().noquote() << proc->readAllStandardError(); QString s = proc->readAllStandardError();
if (s != "." && !s.isEmpty()) {
qDebug().noquote() << s;
}
}); });
proc->start(); proc->start();
@ -64,7 +70,7 @@ bool ServerController::runScript(const SshConnectionParameters &sshParams, QStri
} }
} }
qDebug() << "ServerController::runScript finished"; qDebug() << "ServerController::runScript finished\n";
// client->disconnectFromHost(); // client->disconnectFromHost();
@ -118,6 +124,8 @@ QString ServerController::getTextFileFromContainer(const SshConnectionParameters
QString script = QString("docker exec -i amneziavpn sh -c \"cat \'%1\'\""). QString script = QString("docker exec -i amneziavpn sh -c \"cat \'%1\'\"").
arg(path); arg(path);
qDebug().noquote() << "Copy file from container\n" << script;
SshConnection *client = connectToHost(sshParams); SshConnection *client = connectToHost(sshParams);
QSharedPointer<SshRemoteProcess> proc = client->createRemoteProcess(script.toUtf8()); QSharedPointer<SshRemoteProcess> proc = client->createRemoteProcess(script.toUtf8());