spdf/elektron
Archived
1
0
Fork 0
Code Issues 4 Pull requests 1 Projects Releases Packages Wiki Activity

Revert previous commit. Renamed wrong alias

Browse source
This commit is contained in:
balandi1 2019-11-21 14:12:53 -05:00
parent 9952b9861d
commit 270c8669e6
24 changed files with 229 additions and 229 deletions
Download patch file Download diff file Expand all files Collapse all files

22
pcp/pcp.go
View file

@ -24,7 +24,7 @@ import (
"syscall"
"time"
elekLog "github.com/sirupsen/logrus"
log "github.com/sirupsen/logrus"
"github.com/spdfg/elektron/elektronLogging"
elekLogT "github.com/spdfg/elektron/elektronLogging/types"
)
@ -36,7 +36,7 @@ func Start(quit chan struct{}, logging *bool, pcpConfigFile string) {
pipe, err := cmd.StdoutPipe()
if err != nil {
elekLog.Fatal(err)
log.Fatal(err)
}
//cmd.Stdout = stdout
@ -48,8 +48,8 @@ func Start(quit chan struct{}, logging *bool, pcpConfigFile string) {
// Write to logfile
elektronLogging.ElektronLog.Log(elekLogT.PCP,
elekLog.InfoLevel,
elekLog.Fields{}, scanner.Text())
log.InfoLevel,
log.Fields{}, scanner.Text())
// Throw away first set of results
scanner.Scan()
@ -61,8 +61,8 @@ func Start(quit chan struct{}, logging *bool, pcpConfigFile string) {
if *logging {
elektronLogging.ElektronLog.Log(elekLogT.PCP,
elekLog.InfoLevel,
elekLog.Fields{}, text)
log.InfoLevel,
log.Fields{}, text)
}
seconds++
@ -70,11 +70,11 @@ func Start(quit chan struct{}, logging *bool, pcpConfigFile string) {
}(logging)
elektronLogging.ElektronLog.Log(elekLogT.GENERAL,
elekLog.InfoLevel,
elekLog.Fields{}, "PCP logging started")
log.InfoLevel,
log.Fields{}, "PCP logging started")
if err := cmd.Start(); err != nil {
elekLog.Fatal(err)
log.Fatal(err)
}
pgid, err := syscall.Getpgid(cmd.Process.Pid)
@ -82,8 +82,8 @@ func Start(quit chan struct{}, logging *bool, pcpConfigFile string) {
select {
case <-quit:
elektronLogging.ElektronLog.Log(elekLogT.GENERAL,
elekLog.InfoLevel,
elekLog.Fields{}, "Stopping PCP logging in 5 seconds")
log.InfoLevel,
log.Fields{}, "Stopping PCP logging in 5 seconds")
time.Sleep(5 * time.Second)
// http://stackoverflow.com/questions/22470193/why-wont-go-kill-a-child-process-correctly