-
Notifications
You must be signed in to change notification settings - Fork 1.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1024 from crawlab-team/develop
Develop
- Loading branch information
Showing
20 changed files
with
195 additions
and
198 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,3 +7,4 @@ tmp/ | |
| _book/ | ||
| *.lock | ||
| vendor/ | ||
| .crawlab | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| # Config file for [Air](https://github.com/cosmtrek/air) in TOML format | ||
|
|
||
| # Working directory | ||
| # . or absolute path, please note that the directories following must be under root. | ||
| root = "." | ||
| tmp_dir = "/tmp" | ||
|
|
||
| [build] | ||
| # Just plain old shell command. You could use `make` as well. | ||
| cmd = "go build -o ../tmp/main ./ " | ||
| # Binary file yields from `cmd`. | ||
| bin = "../tmp/main" | ||
| # Customize binary. | ||
| full_bin = "../tmp/main worker" | ||
| # Watch these filename extensions. | ||
| include_ext = ["go", "tpl", "tmpl", "html"] | ||
| # Ignore these filename extensions or directories. | ||
| exclude_dir = ["assets", "tmp", "vendor", "frontend/node_modules"] | ||
| # Watch these directories if you specified. | ||
| include_dir = ["../libs"] | ||
| # Exclude files. | ||
| exclude_file = [] | ||
| # This log file places in your tmp_dir. | ||
| log = "air.log" | ||
| # It's not necessary to trigger build each time file changes if it's too frequent. | ||
| delay = 1000 # ms | ||
| # Stop running old binary when build errors occur. | ||
| stop_on_error = true | ||
| # Send Interrupt signal before killing process (windows does not support this feature) | ||
| send_interrupt = false | ||
| # Delay after sending Interrupt signal | ||
| kill_delay = 500 # ms | ||
|
|
||
| [log] | ||
| # Show log time | ||
| time = false | ||
|
|
||
| [color] | ||
| # Customize each part's color. If no color found, use the raw app log. | ||
| main = "magenta" | ||
| watcher = "cyan" | ||
| build = "yellow" | ||
| runner = "green" | ||
|
|
||
| [misc] | ||
| # Delete tmp directory on exit | ||
| clean_on_exit = true |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| module crawlab | ||
|
|
||
| go 1.15 | ||
|
|
||
| replace ( | ||
| github.com/crawlab-team/crawlab-core => /libs/crawlab-team/crawlab-core | ||
| github.com/crawlab-team/crawlab-vcs => /libs/crawlab-team/crawlab-vcs | ||
| github.com/crawlab-team/crawlab-fs => /libs/crawlab-team/crawlab-fs | ||
| github.com/crawlab-team/crawlab-db => /libs/crawlab-team/crawlab-db | ||
| ) | ||
|
|
||
| require ( | ||
| github.com/apex/log v1.9.0 | ||
| github.com/crawlab-team/crawlab-core v0.6.0-beta.20211113.2050 | ||
| github.com/crawlab-team/go-trace v0.1.0 | ||
| github.com/gin-gonic/gin v1.6.3 | ||
| github.com/spf13/cobra v1.1.3 | ||
| github.com/spf13/viper v1.7.1 | ||
| go.mongodb.org/mongo-driver v1.6.0 // indirect | ||
| go.uber.org/dig v1.10.0 | ||
| ) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| #!/bin/bash | ||
|
|
||
| if [ "${CRAWLAB_NODE_MASTER}" = "Y" ]; then | ||
| # start master | ||
| /bin/bash /app/bin/docker-start-master.sh | ||
|
|
||
| # start crawlab | ||
| crawlab-server master | ||
| else | ||
| # start crawlab | ||
| crawlab-server worker | ||
| fi |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| #!/bin/bash | ||
|
|
||
| # start nginx | ||
| service nginx start | ||
|
|
||
| # start seaweedfs server | ||
| seaweedfsDataPath=/data/seaweedfs | ||
| if [ -e ${seaweedfsDataPath} ]; then | ||
| : | ||
| else | ||
| mkdir -p ${seaweedfsDataPath} | ||
| fi | ||
| weed server \ | ||
| -dir /data \ | ||
| -master.dir ${seaweedfsDataPath} \ | ||
| -volume.dir.idx ${seaweedfsDataPath} \ | ||
| -ip localhost \ | ||
| -volume.port 9999 \ | ||
| -filer \ | ||
| >> /var/log/weed.log 2>&1 & |
2 changes: 1 addition & 1 deletion
2
changelog/v0.6.0-beta.20211116-zh.md → changelog/v0.6.0-beta.20211120-zh.md
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| # 更新日志 (v0.6.0-beta.20211116) | ||
| # 更新日志 (v0.6.0-beta.20211120) | ||
|
|
||
| ## 概览 | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.