MeshCentral/MeshAgent
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshAgent synced 2025-12-22 03:03:18 +00:00
Code Issues Releases Wiki Activity

Fixed bug on Linux Agent, where a service stop, didn't gracefully shutdown the agent. Modified so that SIGTERM is caught, and causes the agent to gracefully shutdown. This change made it so the clipboard cleanup code could correctly run.

Browse Source
This commit is contained in:
Bryan Roe
2022-06-30 01:23:29 -07:00
parent dcd8669746
commit b493da68e4
3 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
modules/clipboard.js
View File

@@ -400,8 +400,7 @@ function lin_xclip_copy(txt)
ch.stdin.write(' for(i=1;i<NF;++i)');
ch.stdin.write(' {');
ch.stdin.write(' split($i,tokens," ");');
ch.stdin.write(' name=substr($i, length(tokens[1])+2);');
ch.stdin.write(' if(substr(name,1,1)==" ") { name=substr($i, length(tokens[1])+3); }');
ch.stdin.write(' name=tokens[2];');
ch.stdin.write(' chkname=substr(name,1,6);')
ch.stdin.write(' if(chkname=="xclip(")');
ch.stdin.write(' {');
@@ -425,7 +424,12 @@ function lin_xclip_copy(txt)
};
ret.child._cleanup = function _cleanup(p)
{
process.kill(this._xclip_PID, 'SIGKILL');
if (this.cleaned) { return; }
this.cleaned = true;
// During Cleanup, we need to kill the xclip process that was spawned, becuase xclip likes to hang around
console.info1('XCLIP/' + (this._xclip_PID) + ' => SIGKILL');
if (this._xclip_PID > 0) { process.kill(this._xclip_PID, 'SIGKILL'); }
delete xclipTable[p._hashCode()];
};
ret.child.on('exit', function ()
@@ -442,10 +446,7 @@ function lin_xclip_copy(txt)
});
ret.child.on('~', function ()
{
if (xclipTable[this.promise._hashCode()])
{
this._cleanup(this.promise);
}
this._cleanup(this.promise);
});
ret.child._xclip_PID = ret.child._helper(ret);
return (ret);