rebased, bumped kindling, used log writer

getlantern · Jan 30, 2025 · a1e9379 · a1e9379
1 parent bd04bbf
commit a1e9379
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2 deletions.
diff --git a/common/httpclient.go b/common/httpclient.go
@@ -32,8 +32,10 @@ func GetHTTPClient() *http.Client {
 	if httpClient != nil {
 		return httpClient
 	}
+
 	// Set the client to the kindling client.
 	k := kindling.NewKindling(
+		kindling.WithLogWriter(log.AsStdLogger().Writer()),
 		kindling.WithDomainFronting("https://media.githubusercontent.com/media/getlantern/fronted/refs/heads/main/fronted.yaml.gz", ""),
 		kindling.WithProxyless(domains...),
 	)

diff --git a/flashlight.go b/flashlight.go
@@ -120,7 +120,6 @@ func New(
 	log.Debugf("Using configdir: %v", configDir)
 	displayVersion(appVersion, revisionDate)
 	common.InitVersion(appVersion)
-	proxied.InitFronted()
 	deviceID := userConfig.GetDeviceID()
 	log.Debugf("You can query for this device's activity under device id: %v", deviceID)
 	fops.InitGlobalContext(

diff --git a/go.mod b/go.mod
@@ -185,7 +185,7 @@ require (
 	github.com/getlantern/hex v0.0.0-20220104173244-ad7e4b9194dc // indirect
 	github.com/getlantern/kcp-go/v5 v5.0.0-20220503142114-f0c1cd6e1b54 // indirect
 	github.com/getlantern/keepcurrent v0.0.0-20240126172110-2e0264ca385d // indirect
-	github.com/getlantern/kindling v0.0.0-20250129184912-6fb98583d540
+	github.com/getlantern/kindling v0.0.0-20250130123355-335942d6c759
 	github.com/getlantern/measured v0.0.0-20230919230611-3d9e3776a6cd // indirect
 	github.com/getlantern/meta-scrubber v0.0.1 // indirect
 	github.com/getlantern/packetforward v0.0.0-20201001150407-c68a447b0360 // indirect

diff --git a/go.sum b/go.sum
@@ -319,6 +319,8 @@ github.com/getlantern/keyman v0.0.0-20230503155501-4e864ca2175b h1:iyEuk8ARQC9Hf
 github.com/getlantern/keyman v0.0.0-20230503155501-4e864ca2175b/go.mod h1:ZJ+yDaZkJ/JU9j7EQa3UUh6ouedrNDDLA5OiowS1Iuk=
 github.com/getlantern/kindling v0.0.0-20250129184912-6fb98583d540 h1:dRWUDDGSUdWFGxYYbTIRLJlAAXjjf2LZ7IGMGTsaeJg=
 github.com/getlantern/kindling v0.0.0-20250129184912-6fb98583d540/go.mod h1:LHrgjBtlsAVHcEJmeJQVewCgtO1i8IepVinbbIiqAXM=
+github.com/getlantern/kindling v0.0.0-20250130123355-335942d6c759 h1:iqS7g1z1vd5DcJnXXZom/a6oyfeQ+dphjXIjI44aY10=
+github.com/getlantern/kindling v0.0.0-20250130123355-335942d6c759/go.mod h1:M2ipr7zWpp76yixs0CgAjJO39h0C/smHAFSIJ1nRe/0=
 github.com/getlantern/lampshade v0.0.0-20201109225444-b06082e15f3a h1:z7G1v79GB1qRrkcbzF0nrLzV/+dwdGmamEZAp0ff+z0=
 github.com/getlantern/lampshade v0.0.0-20201109225444-b06082e15f3a/go.mod h1:cGOfTjvllC9bcwS7cVW6tGT6fXc8Dki384uFjm7XBnw=
 github.com/getlantern/lantern-algeneva v0.0.0-20240930181006-6d3c00db1d5d h1:ACBwPR4du54Qw+X5ajsbMqOFR8euGZRdMGkvTDS7I60=