this repo has no description
hepa: remove deprecated/unused config vars (#909)
this is cleanup from an earlier refactor to move firehose consumption
over to a separate package.
+21
-37
+16
-20
cmd/hepa/main.go
+16
-20
cmd/hepa/main.go
···
261
261
dir,
262
262
Config{
263
263
Logger: logger,
264
-
RelayHost: cctx.String("atp-relay-host"), // DEPRECATED
265
264
BskyHost: cctx.String("atp-bsky-host"),
266
265
OzoneHost: cctx.String("atp-ozone-host"),
267
266
OzoneDID: cctx.String("ozone-did"),
···
276
275
AbyssPassword: cctx.String("abyss-password"),
277
276
RatelimitBypass: cctx.String("ratelimit-bypass"),
278
277
RulesetName: cctx.String("ruleset"),
279
-
FirehoseParallelism: cctx.Int("firehose-parallelism"), // DEPRECATED
280
278
PreScreenHost: cctx.String("prescreen-host"),
281
279
PreScreenToken: cctx.String("prescreen-token"),
282
280
ReportDupePeriod: cctx.Duration("report-dupe-period"),
···
360
358
return NewServer(
361
359
dir,
362
360
Config{
363
-
Logger: logger,
364
-
RelayHost: cctx.String("atp-relay-host"),
365
-
BskyHost: cctx.String("atp-bsky-host"),
366
-
OzoneHost: cctx.String("atp-ozone-host"),
367
-
OzoneDID: cctx.String("ozone-did"),
368
-
OzoneAdminToken: cctx.String("ozone-admin-token"),
369
-
PDSHost: cctx.String("atp-pds-host"),
370
-
PDSAdminToken: cctx.String("pds-admin-token"),
371
-
SetsFileJSON: cctx.String("sets-json-path"),
372
-
RedisURL: cctx.String("redis-url"),
373
-
HiveAPIToken: cctx.String("hiveai-api-token"),
374
-
AbyssHost: cctx.String("abyss-host"),
375
-
AbyssPassword: cctx.String("abyss-password"),
376
-
RatelimitBypass: cctx.String("ratelimit-bypass"),
377
-
RulesetName: cctx.String("ruleset"),
378
-
FirehoseParallelism: cctx.Int("firehose-parallelism"),
379
-
PreScreenHost: cctx.String("prescreen-host"),
380
-
PreScreenToken: cctx.String("prescreen-token"),
361
+
Logger: logger,
362
+
BskyHost: cctx.String("atp-bsky-host"),
363
+
OzoneHost: cctx.String("atp-ozone-host"),
364
+
OzoneDID: cctx.String("ozone-did"),
365
+
OzoneAdminToken: cctx.String("ozone-admin-token"),
366
+
PDSHost: cctx.String("atp-pds-host"),
367
+
PDSAdminToken: cctx.String("pds-admin-token"),
368
+
SetsFileJSON: cctx.String("sets-json-path"),
369
+
RedisURL: cctx.String("redis-url"),
370
+
HiveAPIToken: cctx.String("hiveai-api-token"),
371
+
AbyssHost: cctx.String("abyss-host"),
372
+
AbyssPassword: cctx.String("abyss-password"),
373
+
RatelimitBypass: cctx.String("ratelimit-bypass"),
374
+
RulesetName: cctx.String("ruleset"),
375
+
PreScreenHost: cctx.String("prescreen-host"),
376
+
PreScreenToken: cctx.String("prescreen-token"),
381
377
},
382
378
)
383
379
}
+5
-17
cmd/hepa/server.go
+5
-17
cmd/hepa/server.go
···
6
6
"log/slog"
7
7
"net/http"
8
8
"os"
9
-
"strings"
10
9
"time"
11
10
12
11
"github.com/bluesky-social/indigo/atproto/identity"
···
30
29
Engine *automod.Engine
31
30
RedisClient *redis.Client
32
31
33
-
relayHost string // DEPRECATED
34
-
firehoseParallelism int // DEPRECATED
35
-
logger *slog.Logger
32
+
logger *slog.Logger
36
33
}
37
34
38
35
type Config struct {
39
36
Logger *slog.Logger
40
-
RelayHost string // DEPRECATED
41
37
BskyHost string
42
38
OzoneHost string
43
39
OzoneDID string
···
52
48
AbyssPassword string
53
49
RulesetName string
54
50
RatelimitBypass string
55
-
FirehoseParallelism int // DEPRECATED
56
51
PreScreenHost string
57
52
PreScreenToken string
58
53
ReportDupePeriod time.Duration
···
67
62
logger = slog.New(slog.NewJSONHandler(os.Stdout, &slog.HandlerOptions{
68
63
Level: slog.LevelInfo,
69
64
}))
70
-
}
71
-
72
-
relayws := config.RelayHost
73
-
if !strings.HasPrefix(relayws, "ws") {
74
-
return nil, fmt.Errorf("specified relay host must include 'ws://' or 'wss://'")
75
65
}
76
66
77
67
var ozoneClient *xrpc.Client
···
211
201
bskyClient.Headers["x-ratelimit-bypass"] = config.RatelimitBypass
212
202
}
213
203
blobClient := util.RobustHTTPClient()
214
-
engine := automod.Engine{
204
+
eng := automod.Engine{
215
205
Logger: logger,
216
206
Directory: dir,
217
207
Counters: counters,
···
233
223
}
234
224
235
225
s := &Server{
236
-
relayHost: config.RelayHost,
237
-
firehoseParallelism: config.FirehoseParallelism,
238
-
logger: logger,
239
-
Engine: &engine,
240
-
RedisClient: rdb,
226
+
logger: logger,
227
+
Engine: &eng,
228
+
RedisClient: rdb,
241
229
}
242
230
243
231
return s, nil