c/ooni-probe-cli
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changes based on feedback from @bassosimone

Browse Source
This commit is contained in:
Arturo Filastò 2020-01-29 18:48:12 +01:00
parent 4711a76c11
commit 52332c0977
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.sh
View File

@ -1,10 +1,10 @@
#!/bin/sh #!/bin/bash
set -e set -e
buildtags="" buildtags=""
ldflags="-s -w" ldflags="-s -w"
if [ "$1" = "bindata" ];then if [ "$1" = "bindata" ]; then
GO_BINDATA_V=$(go-bindata -version | grep go-bin | cut -d ' ' -f2) GO_BINDATA_V=$(go-bindata -version | grep go-bin | cut -d ' ' -f2)
[[ "$GO_BINDATA_V" == "3.2.0" ]] && echo "Updating bindata" || exit "Wrong go-bindata-version" [[ "$GO_BINDATA_V" == "3.2.0" ]] && echo "Updating bindata" || exit "Wrong go-bindata-version"
go-bindata -nometadata -o internal/bindata/bindata.go -pkg bindata data/... go-bindata -nometadata -o internal/bindata/bindata.go -pkg bindata data/...

4
internal/database/actions.go
View File

@ -55,14 +55,14 @@ func GetMeasurementJSON(sess sqlbuilder.Database, measurementID int64) (map[stri
log.Errorf("failed to run query %s: %v", req.String(), err) log.Errorf("failed to run query %s: %v", req.String(), err)
return nil, err return nil, err
} }
// MeasurementFilePath might be NULL because the measurement from a
// 3.0.0-beta install
if measurement.Measurement.MeasurementFilePath.Valid == false { if measurement.Measurement.MeasurementFilePath.Valid == false {
log.Error("invalid measurement_file_path") log.Error("invalid measurement_file_path")
log.Error("backup your OONI_HOME and run `ooniprobe reset`") log.Error("backup your OONI_HOME and run `ooniprobe reset`")
return nil, errors.New("cannot access measurement file") return nil, errors.New("cannot access measurement file")
} }
measurementFilePath := measurement.Measurement.MeasurementFilePath.String measurementFilePath := measurement.Measurement.MeasurementFilePath.String
// TODO handle the case in which we have MeasurementFilePath == NULL because
// it's a beta measurement
b, err := ioutil.ReadFile(measurementFilePath) b, err := ioutil.ReadFile(measurementFilePath)
if err != nil { if err != nil {
return nil, err return nil, err