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

use Timestamp intead of java.sql.Date

pull/53/head
Zlatin Balevsky 2020-10-19 17:14:37 +01:00
parent a7d25a1b75
commit 52fb67b35c
No known key found for this signature in database
GPG Key ID: A72832072D525E41
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/src/main/groovy/com/muwire/core/hostcache/H2HostCache.groovy
View File

@ -3,6 +3,8 @@ package com.muwire.core.hostcache
import java.util.function.Predicate import java.util.function.Predicate
import java.util.function.Supplier import java.util.function.Supplier
import java.text.SimpleDateFormat
import com.muwire.core.MuWireSettings import com.muwire.core.MuWireSettings
import com.muwire.core.connection.ConnectionAttemptStatus import com.muwire.core.connection.ConnectionAttemptStatus
import com.muwire.core.trust.TrustService import com.muwire.core.trust.TrustService
@ -14,6 +16,7 @@ import groovy.util.logging.Log
@Log @Log
class H2HostCache extends HostCache { class H2HostCache extends HostCache {
private static final SimpleDateFormat SDF = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS")
private Sql sql private Sql sql
private final File h2Home private final File h2Home
private final File home private final File home
@ -28,7 +31,7 @@ class H2HostCache extends HostCache {
private final Timer timer private final Timer timer
private Collection<Destination> toVerify = new HashSet<>() private Collection<Destination> toVerify = new LinkedHashSet<>()
public H2HostCache(File home, TrustService trustService, MuWireSettings settings, Destination myself) { public H2HostCache(File home, TrustService trustService, MuWireSettings settings, Destination myself) {
super(trustService, settings, myself) super(trustService, settings, myself)
@ -54,7 +57,8 @@ class H2HostCache extends HostCache {
hosts.remove(d) hosts.remove(d)
// record into db // record into db
def timestamp = new java.sql.Date(System.currentTimeMillis()) def timestamp = new Date(System.currentTimeMillis())
timestamp = SDF.format(timestamp)
sql.execute("insert into HOST_ATTEMPTS values ('${d.toBase64()}', '$timestamp', '${status.name()}');") sql.execute("insert into HOST_ATTEMPTS values ('${d.toBase64()}', '$timestamp', '${status.name()}');")
// and re-rank // and re-rank
@ -137,7 +141,8 @@ class H2HostCache extends HostCache {
long timestamp = System.currentTimeMillis() long timestamp = System.currentTimeMillis()
if (entry.lastSuccessfulAttempt != null) if (entry.lastSuccessfulAttempt != null)
timestamp = entry.lastSuccessfulAttempt timestamp = entry.lastSuccessfulAttempt
def tstamp = new java.sql.Date(timestamp) def tstamp = Date(timestamp)
tstamp = SDF.format(tstamp)
sql.execute("insert into HOST_ATTEMPTS VALUES ('${dest.toBase64()}', '$tstamp', 'SUCCESSFUL')") sql.execute("insert into HOST_ATTEMPTS VALUES ('${dest.toBase64()}', '$tstamp', 'SUCCESSFUL')")
} }
hostsJson.renameTo(new File(home, "hosts.json.bak")) hostsJson.renameTo(new File(home, "hosts.json.bak"))