From 11bbc3aa782fee932ffcdc97d378ec3bf09d09d7 Mon Sep 17 00:00:00 2001
From: erinn <erinn@openprivacy.ca>
Date: Sat, 18 Dec 2021 17:20:08 -0800
Subject: [PATCH] bump cwtch and fix miscommits

---
 go.mod | 4 +---
 go.sum | 1 +
 lib.go | 9 ++++-----
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/go.mod b/go.mod
index ab40980..8b7e273 100644
--- a/go.mod
+++ b/go.mod
@@ -3,12 +3,10 @@ module git.openprivacy.ca/cwtch.im/libcwtch-go
 go 1.15
 
 require (
-	cwtch.im/cwtch v0.14.5
+	cwtch.im/cwtch v0.14.6
 	git.openprivacy.ca/cwtch.im/server v1.4.1
 	git.openprivacy.ca/openprivacy/connectivity v1.5.0
 	git.openprivacy.ca/openprivacy/log v1.0.3
 	github.com/mutecomm/go-sqlcipher/v4 v4.4.2
 	golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf // indirect
 )
-
-replace cwtch.im/cwtch => /home/erinn/Android/Goprojects/cwtch
diff --git a/go.sum b/go.sum
index 02918ee..fa5ea4f 100644
--- a/go.sum
+++ b/go.sum
@@ -19,6 +19,7 @@ cwtch.im/cwtch v0.14.4 h1:QbQVzrAqczAG5tGazQvRVfN7MyQPWVN5Fwv7MzCXZs4=
 cwtch.im/cwtch v0.14.4/go.mod h1:/fLuoYLY/7JHw6RojFojpd245CiOcU24QpWqzh9FRDI=
 cwtch.im/cwtch v0.14.5 h1:GY86C8UgqmuGh7ATR4C14hndc+c7PwPI8WH3l2iwnaQ=
 cwtch.im/cwtch v0.14.5/go.mod h1:/fLuoYLY/7JHw6RojFojpd245CiOcU24QpWqzh9FRDI=
+cwtch.im/cwtch v0.14.6/go.mod h1:/fLuoYLY/7JHw6RojFojpd245CiOcU24QpWqzh9FRDI=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 filippo.io/edwards25519 v1.0.0-rc.1 h1:m0VOOB23frXZvAOK44usCgLWvtsxIoMCTBGJZlpmGfU=
 filippo.io/edwards25519 v1.0.0-rc.1/go.mod h1:N1IkdkCkiLB6tki+MYJoSx2JTY9NUlxZE7eHn5EwJns=
diff --git a/lib.go b/lib.go
index 138c172..26d1a0e 100644
--- a/lib.go
+++ b/lib.go
@@ -95,11 +95,10 @@ func StartCwtch(appDir string, torPath string) int {
 	if runtime.GOOS == "android" {
 		log.SetUseColor(false)
 	}
-	// log.SetLevel(log.LevelInfo)
-	// if logLevel := os.Getenv("LOG_LEVEL"); strings.ToLower(logLevel) == "debug" {
-	// 	log.SetLevel(log.LevelDebug)
-	// }
-	log.SetLevel(log.LevelDebug)
+	log.SetLevel(log.LevelInfo)
+	if logLevel := os.Getenv("LOG_LEVEL"); strings.ToLower(logLevel) == "debug" {
+		log.SetLevel(log.LevelDebug)
+	}
 	log.Infof("StartCwtch(...)")
 	// Quick hack check that we're being called with the correct params
 	// On android a stale worker could be calling us with "last apps" directory. Best to abort fast so the app can make a new worker