Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rssfeed #40

Merged
merged 2 commits into from
Apr 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions cmd/rssfeed/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
"os/signal"
"sync"
"time"
"unicode/utf8"
)

var authorMap = map[int]string{
Expand Down Expand Up @@ -71,7 +72,8 @@ func generateFeed(ctx context.Context, entries *feed.Entries, duration time.Dura
Link: "https://rss.feed.svodd.ru",
Description: "Поиск по сайтам Президента России, Министерства иностранных дел Российской Федерации, Министерство обороны Российской Федерации",
}
count := 0
limitCount := 0
itemCount := 0
for {
select {
case <-ctx.Done():
Expand All @@ -83,6 +85,11 @@ func generateFeed(ctx context.Context, entries *feed.Entries, duration time.Dura

link := makeEntryUrl(e.Url, e.Language)

if utf8.RuneCountInString(e.Title) > 200 {
limitCount++
continue
}

item := &rssfeed.RssItem{
Title: e.Title,
Link: link,
Expand All @@ -93,9 +100,10 @@ func generateFeed(ctx context.Context, entries *feed.Entries, duration time.Dura
}

svoddFeed.Add(item)
count++
itemCount++
limitCount++
}
if count >= limit {
if limitCount >= limit {
break
}
}
Expand All @@ -111,7 +119,7 @@ func generateFeed(ctx context.Context, entries *feed.Entries, duration time.Dura
log.Printf("failed to write xml: %v", err)
}

log.Printf("🚩 Создан rss.xml. Всего записей: %d\n", count)
log.Printf("🚩 Создан rss.xml. Всего записей: %d\n", itemCount)
}

func populateAuthorField(author string, resourceID int) string {
Expand Down
18 changes: 9 additions & 9 deletions docker-compose-production.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,15 @@ services:
constraints: [ node.role == manager ]
restart_policy:
condition: on-failure
labels:
- traefik.enable=true
- traefik.docker.network=traefik-public
- traefik.http.routers.feed-srv.rule=Host(`rss.feed.svodd.ru`)
- traefik.http.services.feed-srv.loadBalancer.server.port=8000
- traefik.http.routers.feed-srv.middlewares=frontend-redirect,secure-headers
- traefik.http.routers.feed-srv.entryPoints=https
- traefik.http.routers.feed-srv.tls=true
- traefik.http.routers.feed-srv.tls.certResolver=letsEncrypt
labels:
- traefik.enable=true
- traefik.docker.network=traefik-public
- traefik.http.routers.feed-srv.rule=Host(`rss.feed.svodd.ru`)
- traefik.http.services.feed-srv.loadBalancer.server.port=8000
- traefik.http.routers.feed-srv.middlewares=frontend-redirect,secure-headers
- traefik.http.routers.feed-srv.entryPoints=https
- traefik.http.routers.feed-srv.tls=true
- traefik.http.routers.feed-srv.tls.certResolver=letsEncrypt

kremlin-indexer:
image: ${REGISTRY}/feed-kremlin-indexer:${IMAGE_TAG}
Expand Down
Loading