Skip to content
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
3 changes: 2 additions & 1 deletion cmd/server/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import (
"relaybox/internal/adapter/input/parser"
tcpadapter "relaybox/internal/adapter/input/tcp"
wsadapter "relaybox/internal/adapter/input/websocket"
outputconfig "relaybox/internal/adapter/output/config"
"relaybox/internal/adapter/output/expression"
"relaybox/internal/adapter/output/filequeue"
mariadbadapter "relaybox/internal/adapter/output/mariadb"
Expand Down Expand Up @@ -121,7 +122,7 @@ func runServer(cfgPath string) error {
exprRegistry.Register(exprEngine)

// Config-based routing (hot-reload support)
ruleReader := cfgpkg.NewInMemoryRuleConfigReader(cfg)
ruleReader := outputconfig.NewInMemoryRuleConfigReader(cfg)

// Viper WatchConfig -> hot-reload
v, err := cfgpkg.NewViper(cfgPath)
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"strings"
"testing"

"relaybox/internal/apidocs"
"relaybox/internal/adapter/input/http/apidocs"
)

func TestOpenAPIHandler(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion internal/adapter/input/http/router.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"github.com/go-chi/chi/v5"
"github.com/go-chi/chi/v5/middleware"
"relaybox/internal/adapter/input/websocket"
"relaybox/internal/apidocs"
"relaybox/internal/adapter/input/http/apidocs"
"relaybox/internal/application/port/input"
)

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
package config
package outputconfig

import (
"context"
"fmt"
"sync"

"relaybox/internal/config"
"relaybox/internal/domain"
)

Expand All @@ -19,13 +20,13 @@ type InMemoryRuleConfigReader struct {
inputs map[string]inputEntry // keyed by input ID
}

func NewInMemoryRuleConfigReader(cfg *Config) *InMemoryRuleConfigReader {
func NewInMemoryRuleConfigReader(cfg *config.Config) *InMemoryRuleConfigReader {
r := &InMemoryRuleConfigReader{}
r.Update(cfg)
return r
}

func (r *InMemoryRuleConfigReader) Update(cfg *Config) {
func (r *InMemoryRuleConfigReader) Update(cfg *config.Config) {
outputsByID := make(map[string]domain.Output, len(cfg.Outputs))
for _, c := range cfg.Outputs {
outputsByID[c.ID] = domain.Output{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
package config_test
package outputconfig_test

import (
"context"
"testing"

outputconfig "relaybox/internal/adapter/output/config"
"relaybox/internal/config"
)

// TestInMemoryRuleConfigReader_GetRulesByInputID verifies that rules are indexed
// by input ID regardless of any legacy type value.
// RED: currently fails because Update() uses inp.Type ("BESZEL") as key,
// so GetRules("beszel") returns ErrInputNotFound.
func TestInMemoryRuleConfigReader_GetRulesByInputID(t *testing.T) {
cfg := &config.Config{
Inputs: []config.InputConfig{
Expand All @@ -25,7 +24,7 @@ func TestInMemoryRuleConfigReader_GetRulesByInputID(t *testing.T) {
},
}

r := config.NewInMemoryRuleConfigReader(cfg)
r := outputconfig.NewInMemoryRuleConfigReader(cfg)

// Must find rules by input ID "beszel"
engine, entries, err := r.GetRules(context.Background(), "beszel")
Expand Down
3 changes: 2 additions & 1 deletion test/e2e/e2e_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (
"time"

httpadapter "relaybox/internal/adapter/input/http"
outputconfig "relaybox/internal/adapter/output/config"
"relaybox/internal/adapter/output/expression"
"relaybox/internal/adapter/output/filequeue"
sqliteadapter "relaybox/internal/adapter/output/sqlite"
Expand Down Expand Up @@ -86,7 +87,7 @@ func TestE2E_PostMessage_Returns201(t *testing.T) {
registry := webhookadapter.NewRegistry(map[domain.OutputType]output.OutputSender{
domain.OutputTypeWebhook: sender,
})
ruleReader := cfgpkg.NewInMemoryRuleConfigReader(cfg)
ruleReader := outputconfig.NewInMemoryRuleConfigReader(cfg)
msgSvc := service.NewMessageService(repo, queue, nil, nil)
worker := service.NewRelayWorker(queue, repo, ruleReader, registry, newExprRegistry(), service.DefaultRelayWorkerConfig())

Expand Down
Loading