goldcollection
/
muwire
mirror of https://github.com/zlatinb/muwire
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix thread creation and logging

pull/4/head
Zlatin Balevsky 2018-07-25 23:59:38 +01:00
parent 49bb78688f
commit 82420cc217
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/main/groovy/com/muwire/core/connection/ConnectionEstablisher.groovy
View File

@ -3,6 +3,7 @@ package com.muwire.core.connection
import java.util.concurrent.ExecutorService import java.util.concurrent.ExecutorService
import java.util.concurrent.Executors import java.util.concurrent.Executors
import java.util.concurrent.ThreadFactory import java.util.concurrent.ThreadFactory
import java.util.logging.Level
import java.util.zip.DeflaterInputStream import java.util.zip.DeflaterInputStream
import java.util.zip.DeflaterOutputStream import java.util.zip.DeflaterOutputStream
import java.util.zip.InflaterInputStream import java.util.zip.InflaterInputStream
@ -42,7 +43,8 @@ class ConnectionEstablisher {
this.hostCache = hostCache this.hostCache = hostCache
timer = new Timer("connection-timer",true) timer = new Timer("connection-timer",true)
executor = Executors.newFixedThreadPool(CONCURRENT, { r -> executor = Executors.newFixedThreadPool(CONCURRENT, { r ->
def rv = new Thread(r, true) def rv = new Thread(r)
rv.setDaemon(true)
rv.setName("connector-${System.currentTimeMillis()}") rv.setName("connector-${System.currentTimeMillis()}")
rv rv
} as ThreadFactory) } as ThreadFactory)
@ -106,7 +108,7 @@ class ConnectionEstablisher {
fail endpoint fail endpoint
} }
} catch (Exception e) { } catch (Exception e) {
log.warning("Couldn't connect to ${toTry.toBase32()}", e) log.log(Level.WARNING, "Couldn't connect to ${toTry.toBase32()}", e)
def endpoint = new Endpoint(toTry, null, null) def endpoint = new Endpoint(toTry, null, null)
fail(endpoint) fail(endpoint)
} finally { } finally {
@ -167,7 +169,7 @@ class ConnectionEstablisher {
eventBus.publish(new HostDiscoveredEvent(destination: suggested)) eventBus.publish(new HostDiscoveredEvent(destination: suggested))
} }
} catch (Exception ignore) { } catch (Exception ignore) {
log.warning("Problem parsing post-rejection payload",ignore) log.log(Level.WARNING,"Problem parsing post-rejection payload",ignore)
} finally { } finally {
// the end // the end
e.closeQuietly() e.closeQuietly()