From 72eea9589a6e8a4bd7d8b77b273fa3bc29fb2e03 Mon Sep 17 00:00:00 2001 From: zkqiang Date: Sat, 11 Jul 2020 20:55:05 +0800 Subject: [PATCH 1/3] fix stdout reader --- backend/services/task.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/services/task.go b/backend/services/task.go index d40c3f7b..f553dea0 100644 --- a/backend/services/task.go +++ b/backend/services/task.go @@ -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 From b129913f7f225bf41e95fedb22db648cd8d2787d Mon Sep 17 00:00:00 2001 From: zkqiang Date: Tue, 14 Jul 2020 13:24:19 +0800 Subject: [PATCH 2/3] updated LICENSE --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index c606349b..e41311d2 100644 --- a/LICENSE +++ b/LICENSE @@ -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 From 0185e3905ef487730d3873b23ef6308c97fb0654 Mon Sep 17 00:00:00 2001 From: zkqiang Date: Tue, 14 Jul 2020 17:23:05 +0800 Subject: [PATCH 3/3] fixed github icon --- frontend/src/views/layout/components/Navbar.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/views/layout/components/Navbar.vue b/frontend/src/views/layout/components/Navbar.vue index f70a825b..312882e4 100644 --- a/frontend/src/views/layout/components/Navbar.vue +++ b/frontend/src/views/layout/components/Navbar.vue @@ -275,7 +275,7 @@ docker-compose up -d .github { height: 50px; margin-right: 35px; - margin-top: -10px; + padding-top: 8px; } .upgrade {