diff options
| -rw-r--r-- | args.go | 32 | ||||
| -rw-r--r-- | chomp.go | 15 | ||||
| -rw-r--r-- | go.mod | 2 | ||||
| -rw-r--r-- | go.sum | 4 | ||||
| -rw-r--r-- | wget.go | 30 | ||||
| -rw-r--r-- | windows.go | 8 | ||||
| -rw-r--r-- | windowsWrapper.go | 15 |
7 files changed, 50 insertions, 56 deletions
@@ -6,29 +6,17 @@ import ( "go.wit.com/log" ) -var INFO log.LogFlag -var RUN log.LogFlag -var SSH log.LogFlag +var NOW *log.LogFlag +var INFO *log.LogFlag +var RUN *log.LogFlag +var SSH *log.LogFlag func init() { - INFO.B = false - INFO.Name = "INFO" - INFO.Subsystem = "shell" - INFO.Short = "shell" - INFO.Desc = "general info" - INFO.Register() + full := "go.wit.com/shell" + short := "shell" - RUN.B = false - RUN.Name = "RUN" - RUN.Subsystem = "shell" - RUN.Short = "shell" - RUN.Desc = "Run() info" - RUN.Register() - - SSH.B = false - SSH.Name = "SSH" - SSH.Subsystem = "shell" - SSH.Short = "shell" - SSH.Desc = "ssh() info" - SSH.Register() + NOW = log.NewFlag("NOW", true, full, short, "temp debugging stuff") + INFO = log.NewFlag("INFO", false, full, short, "General Info") + RUN = log.NewFlag("RUN", false, full, short, "Run() info") + SSH = log.NewFlag("SSH", false, full, short, "ssh() info") } @@ -6,11 +6,14 @@ package shell send it anything, always get back a string */ -import "log" -import "fmt" -import "reflect" -import "strings" -import "bytes" +import ( + "fmt" + "reflect" + "strings" + "bytes" + + "go.wit.com/log" +) // import "github.com/davecgh/go-spew/spew" @@ -81,7 +84,7 @@ func Chomp(a interface{}) string { default: tmp := fmt.Sprint("shell.Chomp() NO HANDLER FOR TYPE: %T", a) handleError(fmt.Errorf(tmp), -1) - log.Printf("shell.Chomp() NEED TO MAKE CONVERTER FOR type =", reflect.TypeOf(t)) + log.Warn("shell.Chomp() NEED TO MAKE CONVERTER FOR type =", reflect.TypeOf(t)) } tmp := "shell.Chomp() THIS SHOULD NEVER HAPPEN" handleError(fmt.Errorf(tmp), -1) @@ -6,7 +6,7 @@ require ( github.com/svent/go-nbreader v0.0.0-20150201200112-7cef48da76dc github.com/tmc/scp v0.0.0-20170824174625-f7b48647feef github.com/wercker/journalhook v0.0.0-20230927020745-64542ffa4117 - go.wit.com/log v0.3.1 + go.wit.com/log v0.4.1 golang.org/x/crypto v0.17.0 ) @@ -18,8 +18,8 @@ github.com/tmc/scp v0.0.0-20170824174625-f7b48647feef h1:7D6Nm4D6f0ci9yttWaKjM1T github.com/tmc/scp v0.0.0-20170824174625-f7b48647feef/go.mod h1:WLFStEdnJXpjK8kd4qKLwQKX/1vrDzp5BcDyiZJBHJM= github.com/wercker/journalhook v0.0.0-20230927020745-64542ffa4117 h1:67A5tweHp3C7osHjrYsy6pQZ00bYkTTttZ7kiOwwHeA= github.com/wercker/journalhook v0.0.0-20230927020745-64542ffa4117/go.mod h1:XCsSkdKK4gwBMNrOCZWww0pX6AOt+2gYc5Z6jBRrNVg= -go.wit.com/log v0.3.1 h1:UXtgJ4dwyWL0Yv4mw6gQnlmrIQU/zz6nClCB7NGKBQs= -go.wit.com/log v0.3.1/go.mod h1:GmsggfsKrqdZdAj26fEOlcTz6qEIazbV33uyuuktvB8= +go.wit.com/log v0.4.1 h1:x2PXlm1exgFrweGTM7thyj6KJabtnGlXssYkxv56hpc= +go.wit.com/log v0.4.1/go.mod h1:EZLvivLZpMoXl5AUBArH0zsIgr+c+WyNXm14BCF+sdw= go.wit.com/spew v0.0.0-20240101141411-c7b8e91573c9 h1:UEX2EzLQPzLTfy/kUFQD7OXtvKn8wk/+jpDOkbl4ff4= go.wit.com/spew v0.0.0-20240101141411-c7b8e91573c9/go.mod h1:qBpgJXThMMT15vym7/E4Ur9y8oOo2nP7t2RP52QHUNw= golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k= @@ -10,18 +10,16 @@ package shell global variables */ -import "io" -import "os" -import "fmt" -import "log" -import "bytes" -import "strings" -import "net/http" +import ( + "io" + "os" + "fmt" + "bytes" + "strings" + "net/http" -/* -import "go.wit.com/shell" -import "github.com/davecgh/go-spew/spew" -*/ + "go.wit.com/log" +) func Wget(url string) (*bytes.Buffer) { buf := new(bytes.Buffer) @@ -34,7 +32,7 @@ func Wget(url string) (*bytes.Buffer) { } defer resp.Body.Close() - log.Printf("res.StatusCode: %d\n", resp.StatusCode) + log.Log(INFO, "res.StatusCode: %d\n", resp.StatusCode) if (resp.StatusCode != 200) { handleError(fmt.Errorf(fmt.Sprint("%d", resp.StatusCode)), -1) return nil @@ -45,8 +43,8 @@ func Wget(url string) (*bytes.Buffer) { } func WgetToFile(filepath string, url string) error { - log.Println("WgetToFile() filepath =", filepath) - log.Println("WgetToFile() URL =", url) + log.Log(INFO, "WgetToFile() filepath =", filepath) + log.Log(INFO, "WgetToFile() URL =", url) // Get the data resp, err := http.Get(url) if err != nil { @@ -81,7 +79,7 @@ func Write(filepath string, data string) bool { data = Chomp(data) + "\n" // Create the file ospath := Path(filepath) - log.Println("shell.Write() START ospath =", ospath, "filepath =", filepath) + log.Log(INFO, "shell.Write() START ospath =", ospath, "filepath =", filepath) out, err := os.Create(ospath) if err != nil { return false @@ -96,6 +94,6 @@ func Write(filepath string, data string) bool { return false } handleError(nil, int(count)) - log.Println("shell.Write() END", ospath) + log.Log(INFO, "shell.Write() END", ospath) return true } @@ -4,15 +4,17 @@ package shell -import "log" +import ( + "go.wit.com/log" +) // import "go.wit.com/shell" // import "github.com/davecgh/go-spew/spew" func handleSignal(err interface{}, ret int) { - log.Println("handleSignal() windows doesn't do signals") + log.Warn("handleSignal() windows doesn't do signals") } func UseJournalctl() { - log.Println("journalctl doesn't exist on windows") + log.Warn("journalctl doesn't exist on windows") } diff --git a/windowsWrapper.go b/windowsWrapper.go index 702cf9a..e0ea2b2 100644 --- a/windowsWrapper.go +++ b/windowsWrapper.go @@ -1,8 +1,11 @@ package shell -import "log" -import "runtime" -import "strings" +import ( + "runtime" + "strings" + + "go.wit.com/log" +) func Execname(filename string) string { if runtime.GOOS != "windows" { @@ -12,12 +15,12 @@ func Execname(filename string) string { } func Path(filename string) string { - log.Println("shell.Path() START filename =", filename) + log.Log(INFO, "Path() START filename =", filename) if runtime.GOOS != "windows" { - log.Println("shell.Path() END filename =", filename) + log.Log(INFO, "Path() END filename =", filename) return filename } filename = strings.Replace(filename, "/", "\\", -1) - log.Println("shell.Path() END filename =", filename) + log.Log(INFO, "Path() END filename =", filename) return filename } |