idk/muwire
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

request is already processed on threadpool

Browse Source
This commit is contained in:
Zlatin Balevsky
2019-05-24 17:49:04 +01:00
parent 0a5c5ad520
commit b308b4e91f
1 changed files with 25 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
core/src/main/groovy/com/muwire/core/connection/ConnectionAcceptor.groovy
View File

@@ -174,35 +174,33 @@ class ConnectionAcceptor {
dis.readFully(ost) dis.readFully(ost)
if (ost != "OST ".getBytes(StandardCharsets.US_ASCII)) if (ost != "OST ".getBytes(StandardCharsets.US_ASCII))
throw new IOException("Invalid POST connection") throw new IOException("Invalid POST connection")
handshakerThreads.execute({ JsonSlurper slurper = new JsonSlurper()
JsonSlurper slurper = new JsonSlurper() try {
try { byte uuid = new byte[36]
byte uuid = new byte[36] dis.readFully(uuid)
dis.readFully(uuid) UUID resultsUUID = UUID.fromString(new String(uuid, StandardCharsets.US_ASCII))
UUID resultsUUID = UUID.fromString(new String(uuid, StandardCharsets.US_ASCII)) if (!searchManager.hasLocalSearch(resultsUUID))
if (!searchManager.hasLocalSearch(resultsUUID)) throw new UnexpectedResultsException(resultsUUID.toString())
throw new UnexpectedResultsException(resultsUUID.toString())
byte rn = new byte[2] byte rn = new byte[2]
dis.readFully(rn) dis.readFully(rn)
if (rn != "\r\n".getBytes(StandardCharsets.US_ASCII)) if (rn != "\r\n".getBytes(StandardCharsets.US_ASCII))
throw new IOException("invalid request header") throw new IOException("invalid request header")
Persona sender = new Persona(dis) Persona sender = new Persona(dis)
int nResults = dis.readUnsignedShort() int nResults = dis.readUnsignedShort()
for (int i = 0; i < nResults; i++) { for (int i = 0; i < nResults; i++) {
int jsonSize = dis.readUnsignedShort() int jsonSize = dis.readUnsignedShort()
byte [] payload = new byte[jsonSize] byte [] payload = new byte[jsonSize]
dis.readFully(payload) dis.readFully(payload)
def json = slurper.parse(payload) def json = slurper.parse(payload)
eventBus.publish(ResultsParser.parse(sender, json)) eventBus.publish(ResultsParser.parse(sender, json))
}
} catch (IOException | UnexpectedResultsException | InvalidSearchResultException bad) {
log.warning(bad)
} finally {
e.closeQuietly()
} }
} as Runnable) } catch (IOException | UnexpectedResultsException | InvalidSearchResultException bad) {
log.warning(bad)
} finally {
e.closeQuietly()
}
} }
} }