Merge branch 'develop' of github.com:crawlab-team/crawlab into develop

This commit is contained in:
marvzhang
2020-07-15 11:19:38 +08:00
3 changed files with 4 additions and 4 deletions

View File

@@ -1,6 +1,6 @@
BSD 3-Clause License
Copyright (c) 2019, Marvin Zhang
Copyright (c) 2020, Crawlab Team
All rights reserved.
Redistribution and use in source and binary forms, with or without

View File

@@ -175,21 +175,21 @@ func SetLogConfig(wg *sync.WaitGroup, cmd *exec.Cmd, t model.Task, u model.User)
spiderLogIndex := viper.GetString("setting.spiderLogIndex")
// get stdout reader
stdout, err := cmd.StdoutPipe()
readerStdout := bufio.NewReader(stdout)
if err != nil {
log.Errorf("get stdout error: %s", err.Error())
debug.PrintStack()
return err
}
readerStdout := bufio.NewReader(stdout)
// get stderr reader
stderr, err := cmd.StderrPipe()
readerStderr := bufio.NewReader(stderr)
if err != nil {
log.Errorf("get stdout error: %s", err.Error())
debug.PrintStack()
return err
}
readerStderr := bufio.NewReader(stderr)
var seq int64
var logs []model.LogItem

View File

@@ -275,7 +275,7 @@ docker-compose up -d
.github {
height: 50px;
margin-right: 35px;
margin-top: -10px;
padding-top: 8px;
}
.upgrade {