danog/ecodash
1
0
Fork 0
forked from massivebox/ecodash
Code Pull requests Activity

Merge pull request 'UwU' (#2) from danog/ecodash:master into master

Browse source 
Reviewed-on: ecodash/ecodash#2
This commit is contained in:
MassiveBox 2023-05-01 22:25:07 +02:00
parent 3d5e82e774 9423b578b8
commit 784dddb7ed
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.golangci.yml
View file

@ -1,7 +1,7 @@
# options for analysis running # options for analysis running
run: run:
# timeout for analysis, e.g. 30s, 5m, default is 1m # timeout for analysis, e.g. 30s, 5m, default is 1m
timeout: 10m timeout: 30m
# output configuration options # output configuration options
output: output:

2
Dockerfile
View file

@ -21,6 +21,6 @@ WORKDIR /app
COPY --from=1 /app/app . COPY --from=1 /app/app .
COPY ./templates /app/templates COPY ./templates /app/templates
RUN touch config.json RUN touch config.json database.db
CMD ["./app"] CMD ["./app"]

4
src/ecodash/api.go
View file

@ -27,7 +27,8 @@ func dayStart(t time.Time) time.Time {
var errNon200 = errors.New("got a non-200 status code. Check the correctness of sensors IDs") var errNon200 = errors.New("got a non-200 status code. Check the correctness of sensors IDs")
func (config *Config) queryHistory(entityID string, startTime, endTime time.Time) (HistoryResult, error) { func (config *Config) queryHistory(entityID string, startTime, endTime time.Time) (HistoryResult, error) {
ctx, cancel := context.WithTimeout(context.Background(), 1*time.Minute) ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
defer cancel()
req, err := http.NewRequestWithContext( req, err := http.NewRequestWithContext(
ctx, ctx,
http.MethodGet, http.MethodGet,
@ -40,7 +41,6 @@ func (config *Config) queryHistory(entityID string, startTime, endTime time.Time
), ),
http.NoBody, http.NoBody,
) )
cancel()
if err != nil { if err != nil {
return HistoryResult{}, err return HistoryResult{}, err
} }

2
templates/default/admin.html
View file

@ -19,7 +19,7 @@
<h3>HomeAssistant</h3> <h3>HomeAssistant</h3>
<label>HomeAssistant's base URL <input type="text" name="base_url" value="{{.Config.HomeAssistant.BaseURL}}" required></label> <label>HomeAssistant's base URL <input type="text" name="base_url" value="{{.Config.HomeAssistant.BaseURL}}" required></label>
<label>HomeAssistant's API Key <input type="text" name="api_key" value="{{.Config.HomeAssistant.ApiKey}}" required></label> <label>HomeAssistant's API Key <input type="text" name="api_key" value="{{.Config.HomeAssistant.APIKey}}" required></label>
<lablel>Installation date<input type="date" name="installation_date" value="{{HTMLDateFormat .Config.HomeAssistant.InstallationDate}}" required></lablel> <lablel>Installation date<input type="date" name="installation_date" value="{{HTMLDateFormat .Config.HomeAssistant.InstallationDate}}" required></lablel>
<h3>Sensors</h3> <h3>Sensors</h3>