Merge branch 'master' into fix-165

This commit is contained in:
Brandon Nozaki Miller 2019-12-02 00:57:26 -08:00 committed by GitHub
commit 7469dbac01
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions

View file

@ -122,7 +122,7 @@ Set these variables in the `ipc.config` scope to overwrite or set default values
| variable | documentation |
|----------|---------------|
| appspace | used for Unix Socket (Unix Domain Socket) namespacing. If not set specifically, the Unix Domain Socket will combine the socketRoot, appspace, and id to form the Unix Socket Path for creation or binding. This is available incase you have many apps running on your system, you may have several sockets with the same id, but if you change the appspace, you will still have app specic unique sockets.|
| appspace | used for Unix Socket (Unix Domain Socket) namespacing. If not set specifically, the Unix Domain Socket will combine the socketRoot, appspace, and id to form the Unix Socket Path for creation or binding. This is available in case you have many apps running on your system, you may have several sockets with the same id, but if you change the appspace, you will still have app specic unique sockets.|
| socketRoot| the directory in which to create or bind to a Unix Socket |
| id | the id of this socket or service |
| networkHost| the local or remote host on which TCP, TLS or UDP Sockets should connect |
@ -464,7 +464,7 @@ or specifying everything UDP
| method | definition |
|-----------|------------|
|start| start serving need top call ` serve ` or ` serveNet ` first to set up the server |
|start| start serving need to call ` serve ` or ` serveNet ` first to set up the server |
|stop| close the server and stop serving |
----

View file

@ -161,18 +161,18 @@ function gotData(socket,data,UDPSocket){
return;
}
if(!this.ipcBuffer){
this.ipcBuffer='';
if(!sock.ipcBuffer){
sock.ipcBuffer='';
}
data=(this.ipcBuffer+=data);
data=(sock.ipcBuffer+=data);
if(data.slice(-1)!=eventParser.delimiter || data.indexOf(eventParser.delimiter) == -1){
this.log('Messages are large, You may want to consider smaller messages.');
return;
}
this.ipcBuffer='';
sock.ipcBuffer='';
data=eventParser.parse(data);