mirror/nzbget
1
0
Fork 0
mirror of https://github.com/nzbget/nzbget.git synced 2026-04-24 14:56:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

added the automatic termination (killing) of post-process-script on server's shutdown

Browse Source
This commit is contained in:
Andrey Prygunkov
2008-03-23 15:26:07 +00:00
parent 876fee3bc5
commit dfa839c4e0
5 changed files with 77 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
ScriptController.cpp
View File

@@ -75,12 +75,14 @@ void ScriptController::StartScriptJob(PostInfo* pPostInfo, const char* szScript,
pScriptController->m_szScript = szScript;
pScriptController->m_bNZBFileCompleted = bNZBFileCompleted;
pScriptController->m_bHasFailedParJobs = bHasFailedParJobs;
pScriptController->SetAutoDestroy(true);
pScriptController->SetAutoDestroy(false);
pPostInfo->SetScriptThread(pScriptController);
pScriptController->Start();
// wait until process starts or fails to start
while (pPostInfo->GetWorking() && pPostInfo->GetStageProgress() == 0)
while (pPostInfo->GetWorking() && !pScriptController->m_hProcess)
{
usleep(50 * 1000);
}
@@ -147,7 +149,9 @@ void ScriptController::Run()
m_pPostInfo->SetWorking(false);
return;
}
m_hProcess = ProcessInfo.hProcess;
/* close unused "write" end */
CloseHandle(hWritePipe);
@@ -217,19 +221,18 @@ void ScriptController::Run()
}
// continue the first instance
m_hProcess = pid;
/* close unused "write" end */
close(pipeout);
#endif
m_pPostInfo->SetStageProgress(500);
/* open the read end */
FILE* readpipe = fdopen(pipein, "r");
char* buf = (char*)malloc(10240);
debug("Entering pipe-loop");
while (!feof(readpipe))
while (!feof(readpipe) && !IsStopped())
{
if (fgets(buf, 10240, readpipe))
{
@@ -241,13 +244,22 @@ void ScriptController::Run()
free(buf);
fclose(readpipe);
if (IsStopped())
{
warn("Interrupted post-process-script for %s", m_pPostInfo->GetInfoName());
}
#ifdef WIN32
WaitForSingleObject(ProcessInfo.hProcess, INFINITE);
WaitForSingleObject(m_hProcess, INFINITE);
#else
waitpid(pid, NULL, 0);
waitpid(m_hProcess, NULL, 0);
#endif
info("Completed post-process-script for %s", m_pPostInfo->GetInfoName());
if (!IsStopped())
{
info("Completed post-process-script for %s", m_pPostInfo->GetInfoName());
}
m_pPostInfo->SetStage(PostInfo::ptFinished);
m_pPostInfo->SetWorking(false);
}
@@ -352,3 +364,26 @@ void ScriptController::AddMessage(char* szText)
}
}
}
void ScriptController::Stop()
{
debug("Stopping post-process-script");
Thread::Stop();
#ifdef WIN32
BOOL bOK = TerminateProcess(m_hProcess, -1);
#else
bool bOK = kill(m_hProcess, 9) == 0;
#endif
if (bOK)
{
debug("Terminated post-process-script");
}
else
{
error("Could not terminate post-process-script");
}
debug("Post-process-script stopped");
}