diff --git a/clickhouse.go b/clickhouse.go index 677761f656d03a4c4a69521e228a276f9ef5853f..4738bf0342add31e7397f6c39984924c24457b2e 100644 --- a/clickhouse.go +++ b/clickhouse.go @@ -3,6 +3,7 @@ package main import ( "context" "database/sql" + "errors" "flag" "time" @@ -10,7 +11,7 @@ import ( ) var ( - clickhouseAddr = flag.String("clickhouse-url", getenv("CLICKHOUSE_ADDR", "log-collector:9700"), "ClickHouse address") + clickhouseAddr = flag.String("clickhouse", getenv("CLICKHOUSE_ADDR", "log-collector:9700"), "ClickHouse address") clickhouseUser = flag.String("clickhouse-user", getenv("CLICKHOUSE_USER", "clickhouse"), "ClickHouse auth username") clickhousePassword = flag.String("clickhouse-password", getenv("CLICKHOUSE_PASSWORD", ""), "ClickHouse auth password") ) @@ -47,7 +48,11 @@ func (c *chChecker) check(ctx context.Context, id string, timestamp time.Time) ( "SELECT 1 FROM logs.syslog WHERE message = ? LIMIT 1", id) var i int - if err := row.Scan(&i); err != nil { + err := row.Scan(&i) + if errors.Is(err, sql.ErrNoRows) { + return false, nil + } + if err != nil { return false, err } return true, nil