Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replace time.Now().Sub(t) with time.Since(t) #7

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Replace time.Now().Sub(t) with time.Since(t) #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cmd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,14 @@ func runCmd(command string, args []string, env []string, cmdDir string) (string,
if exitError, ok := err.(*exec.ExitError); ok {
log.Println("-> EXIT CODE: ", exitError.ExitCode())

log.Println("-> TIME TAKEN: ", time.Now().Sub(startTime)/time.Millisecond)
log.Println("-> TIME TAKEN: ", time.Since(startTime)/time.Millisecond)
log.Println("==> END EXEC COMMAND " + command + "\n")

return string(stdoutBuf.Bytes()), string(stderrBuf.Bytes()), err
}
}

log.Println("-> TIME TAKEN: ", time.Now().Sub(startTime)/time.Millisecond)
log.Println("-> TIME TAKEN: ", time.Since(startTime)/time.Millisecond)
log.Println("=> END EXEC COMMAND " + command + "\n")

if bytes.Compare(stdoutBuf.Bytes(), stderrBuf.Bytes()) == 0 {
Expand Down
90 changes: 90 additions & 0 deletions cmd.go.orig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
package main

import (
"bytes"
"io"
"log"
"os"
"os/exec"
"strings"
"sync"
"time"
)

func runCmd(command string, args []string, env []string, cmdDir string) (string, string, error) {
cmd := exec.Command(command, args...)
cmd.Dir = cmdDir
cmd.Env = os.Environ()
cmd.Env = append(cmd.Env, env...)

var stdoutBuf, stderrBuf bytes.Buffer
stdoutIn, _ := cmd.StdoutPipe()
stderrIn, _ := cmd.StderrPipe()

stdout := io.MultiWriter(os.Stdout, &stdoutBuf)
stderr := io.MultiWriter(os.Stderr, &stderrBuf)

startTime := time.Now()

err := cmd.Start()
if err != nil {
return string(stdoutBuf.Bytes()), string(stderrBuf.Bytes()), err
}

log.Println("==> EXEC COMMAND " + command)
log.Println("-> ARGS: " + strings.Join(args[:], " "))
log.Println("-> DIR: " + cmdDir)
log.Println("-> STDOUT/STDERR: ..")

var wg sync.WaitGroup
wg.Add(1)

go func() {
_, _ = io.Copy(stdout, stdoutIn)
wg.Done()
}()

_, _ = io.Copy(stderr, stderrIn)
wg.Wait()

err = cmd.Wait()

if err != nil {
log.Println("-> ERROR: ", err.Error())
if exitError, ok := err.(*exec.ExitError); ok {
log.Println("-> EXIT CODE: ", exitError.ExitCode())

log.Println("-> TIME TAKEN: ", time.Now().Sub(startTime)/time.Millisecond)
log.Println("==> END EXEC COMMAND " + command + "\n")

return string(stdoutBuf.Bytes()), string(stderrBuf.Bytes()), err
}
}

log.Println("-> TIME TAKEN: ", time.Now().Sub(startTime)/time.Millisecond)
log.Println("=> END EXEC COMMAND " + command + "\n")

if bytes.Compare(stdoutBuf.Bytes(), stderrBuf.Bytes()) == 0 {
log.Println("Both stdout and stderr have same value")
}

return string(stdoutBuf.Bytes()), string(stderrBuf.Bytes()), nil
}

func ExampleOpenFile() {
f, err := os.OpenFile("notes.txt", os.O_RDWR|os.O_CREATE, 0755)
if err != nil {
log.Fatal(err)
}

if err := f.Close(); err != nil {
log.Fatal(err)
}

}

func createTempFile() {
tmpFile, _ := os.Create("emptyFile.txt")
log.Println(tmpFile)

}