remove EXPOSE instruction from Dockerfile, rename cron.checkConquers -> cron.checkEnnoblements

This commit is contained in:
Dawid Wysokiński 2020-05-30 19:58:25 +02:00
parent ff6034c995
commit e71b45c2e8
3 changed files with 8 additions and 11 deletions

View File

@ -7,8 +7,6 @@ COPY . .
RUN go build -o main . RUN go build -o main .
EXPOSE 8080
ADD https://github.com/ufoscout/docker-compose-wait/releases/download/2.2.1/wait ./wait ADD https://github.com/ufoscout/docker-compose-wait/releases/download/2.2.1/wait ./wait
RUN chmod +x ./wait RUN chmod +x ./wait

View File

@ -33,25 +33,25 @@ func AttachHandlers(c *cron.Cron, cfg Config) {
tribeRepo: cfg.TribeRepo, tribeRepo: cfg.TribeRepo,
discord: cfg.Discord, discord: cfg.Discord,
} }
c.AddFunc("@every 1m", h.checkConquers) c.AddFunc("@every 1m", h.checkEnnoblements)
} }
func (h *handler) checkConquers() { func (h *handler) checkEnnoblements() {
worlds, err := h.tribeRepo.FetchWorlds(context.Background()) worlds, err := h.tribeRepo.FetchWorlds(context.Background())
if err != nil { if err != nil {
log.Print("checkConquers: " + err.Error()) log.Print("checkEnnoblements: " + err.Error())
return return
} }
log.Print("checkConquers: worlds: ", worlds) log.Print("checkEnnoblements: worlds: ", worlds)
servers, total, err := h.serverRepo.Fetch(context.Background(), nil) servers, total, err := h.serverRepo.Fetch(context.Background(), nil)
if err != nil { if err != nil {
log.Print("checkConquers: " + err.Error()) log.Print("checkEnnoblements: " + err.Error())
return return
} }
log.Print("checkConquers: total number of servers: ", total) log.Print("checkEnnoblements: total number of servers: ", total)
data := scraper.New(worlds, h.since).Scrap() data := scraper.New(worlds, h.since).Scrap()
h.since = time.Now() h.since = time.Now()
log.Print("checkConquers: scrapped data: ", data) log.Print("checkEnnoblements: scrapped data: ", data)
for _, server := range servers { for _, server := range servers {
if server.ConqueredVillagesChannelID == "" && server.LostVillagesChannelID == "" { if server.ConqueredVillagesChannelID == "" && server.LostVillagesChannelID == "" {
continue continue

View File

@ -12,8 +12,7 @@ const (
var mode = DevelopmentMode var mode = DevelopmentMode
func init() { func init() {
mode := os.Getenv(EnvMode) Set(os.Getenv(EnvMode))
Set(mode)
} }
func Set(value string) { func Set(value string) {