nathan/go-weatherstation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improve charts and logs

Browse Source
This commit is contained in:
Nathan Coad
2026-01-28 17:00:24 +11:00
parent aa71b51524
commit 536ec7ad70
4 changed files with 25 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
internal/db/series.go
View File

@@ -34,6 +34,7 @@ type ForecastPoint struct {
WindGustMS *float64 `json:"wind_gust_m_s,omitempty"`
WindDirDeg *float64 `json:"wind_dir_deg,omitempty"`
PrecipMM *float64 `json:"precip_mm,omitempty"`
PrecipProb *float64 `json:"precip_prob,omitempty"`
CloudCover *float64 `json:"cloud_cover,omitempty"`
}
@@ -195,6 +196,7 @@ func (d *DB) ForecastSeriesLatest(ctx context.Context, site, model string) (Fore
wind_gust_m_s,
wind_dir_deg,
precip_mm,
precip_prob,
cloud_cover
FROM forecast_openmeteo_hourly
WHERE site = $1 AND model = $2 AND retrieved_at = $3
@@ -210,9 +212,9 @@ func (d *DB) ForecastSeriesLatest(ctx context.Context, site, model string) (Fore
var (
ts time.Time
temp, rh, msl, wind, gust sql.NullFloat64
dir, precip, cloud sql.NullFloat64
dir, precip, prob, cloud sql.NullFloat64
)
if err := rows.Scan(&ts, &temp, &rh, &msl, &wind, &gust, &dir, &precip, &cloud); err != nil {
if err := rows.Scan(&ts, &temp, &rh, &msl, &wind, &gust, &dir, &precip, &prob, &cloud); err != nil {
return ForecastSeries{}, err
}
points = append(points, ForecastPoint{
@@ -224,6 +226,7 @@ func (d *DB) ForecastSeriesLatest(ctx context.Context, site, model string) (Fore
WindGustMS: nullFloatPtr(gust),
WindDirDeg: nullFloatPtr(dir),
PrecipMM: nullFloatPtr(precip),
PrecipProb: nullFloatPtr(prob),
CloudCover: nullFloatPtr(cloud),
})
}
@@ -249,6 +252,7 @@ func (d *DB) ForecastSeriesRange(ctx context.Context, site, model string, start,
wind_gust_m_s,
wind_dir_deg,
precip_mm,
precip_prob,
cloud_cover
FROM forecast_openmeteo_hourly
WHERE site = $1 AND model = $2 AND ts >= $3 AND ts <= $4
@@ -266,9 +270,9 @@ func (d *DB) ForecastSeriesRange(ctx context.Context, site, model string, start,
ts time.Time
retrieved time.Time
temp, rh, msl, wind, gust sql.NullFloat64
dir, precip, cloud sql.NullFloat64
dir, precip, prob, cloud sql.NullFloat64
)
if err := rows.Scan(&ts, &retrieved, &temp, &rh, &msl, &wind, &gust, &dir, &precip, &cloud); err != nil {
if err := rows.Scan(&ts, &retrieved, &temp, &rh, &msl, &wind, &gust, &dir, &precip, &prob, &cloud); err != nil {
return ForecastSeries{}, err
}
if retrieved.After(maxRetrieved) {
@@ -283,6 +287,7 @@ func (d *DB) ForecastSeriesRange(ctx context.Context, site, model string, start,
WindGustMS: nullFloatPtr(gust),
WindDirDeg: nullFloatPtr(dir),
PrecipMM: nullFloatPtr(precip),
PrecipProb: nullFloatPtr(prob),
CloudCover: nullFloatPtr(cloud),
})
}

21
internal/providers/openmeteo.go
View File

@@ -77,23 +77,34 @@ func (o *OpenMeteo) Fetch(ctxDone <-chan struct{}, site Site, model string) (*Fo
}
defer resp.Body.Close()
const maxLogBody = int64(65536)
bodyBuf, _ := io.ReadAll(io.LimitReader(resp.Body, maxLogBody+1))
truncated := int64(len(bodyBuf)) > maxLogBody
if truncated {
bodyBuf = bodyBuf[:maxLogBody]
}
if truncated {
log.Printf("open-meteo response status=%d bytes=%d truncated=true body=%s", resp.StatusCode, len(bodyBuf), string(bodyBuf))
} else {
log.Printf("open-meteo response status=%d bytes=%d body=%s", resp.StatusCode, len(bodyBuf), string(bodyBuf))
}
if resp.StatusCode/100 != 2 {
body, _ := io.ReadAll(io.LimitReader(resp.Body, 4096))
var apiErr struct {
Error bool `json:"error"`
Reason string `json:"reason"`
}
if err := json.Unmarshal(body, &apiErr); err == nil && apiErr.Reason != "" {
if err := json.Unmarshal(bodyBuf, &apiErr); err == nil && apiErr.Reason != "" {
return nil, fmt.Errorf("open-meteo HTTP %d: %s", resp.StatusCode, apiErr.Reason)
}
if len(body) > 0 {
return nil, fmt.Errorf("open-meteo HTTP %d: %s", resp.StatusCode, string(body))
if len(bodyBuf) > 0 {
return nil, fmt.Errorf("open-meteo HTTP %d: %s", resp.StatusCode, string(bodyBuf))
}
return nil, fmt.Errorf("open-meteo HTTP %d", resp.StatusCode)
}
var raw map[string]any
if err := json.NewDecoder(resp.Body).Decode(&raw); err != nil {
if err := json.Unmarshal(bodyBuf, &raw); err != nil {
return nil, err
}