From 2cda2d9639addd2c73060216f66cddf5f31ff2c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arturo=20Filast=C3=B2?= Date: Wed, 15 May 2019 19:26:24 +0200 Subject: [PATCH 1/4] Bump version --- ooni.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ooni.go b/ooni.go index 5e933b1..e54bb23 100644 --- a/ooni.go +++ b/ooni.go @@ -16,7 +16,7 @@ import ( "upper.io/db.v3/lib/sqlbuilder" ) -const Version = "3.0.0-beta.2" +const Version = "3.0.0-beta.3" // Context for OONI Probe type Context struct { From 4ead3802a4fc385baf371a73d7a5a6abffe126d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arturo=20Filast=C3=B2?= Date: Wed, 15 May 2019 19:29:34 +0200 Subject: [PATCH 2/4] Bump MK verbosity and print SSL_CERT value --- nettests/nettests.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nettests/nettests.go b/nettests/nettests.go index fcd468b..f618173 100644 --- a/nettests/nettests.go +++ b/nettests/nettests.go @@ -89,7 +89,7 @@ func (c *Controller) Init(nt *mk.Nettest) error { IncludeIP: c.Ctx.Config.Sharing.IncludeIP, IncludeASN: c.Ctx.Config.Sharing.IncludeASN, IncludeCountry: c.Ctx.Config.Sharing.IncludeCountry, - LogLevel: "INFO", + LogLevel: "DEBUG", ProbeCC: c.Ctx.Location.CountryCode, ProbeASN: fmt.Sprintf("AS%d", c.Ctx.Location.ASN), @@ -113,6 +113,7 @@ func (c *Controller) Init(nt *mk.Nettest) error { nt.Options.CaBundlePath = sslCertFile } + log.Debugf("CaBundlePath: %s", nt.Options.CaBundlePath) log.Debugf("GeoIPASNPath: %s", nt.Options.GeoIPASNPath) log.Debugf("GeoIPCountryPath: %s", nt.Options.GeoIPCountryPath) From 6afc8bcc9466d3f504046ebc9134c76cd38b0523 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arturo=20Filast=C3=B2?= Date: Wed, 15 May 2019 19:30:10 +0200 Subject: [PATCH 3/4] Remove reference to caBundlePath --- nettests/nettests.go | 1 - 1 file changed, 1 deletion(-) diff --git a/nettests/nettests.go b/nettests/nettests.go index f618173..8ad5f0f 100644 --- a/nettests/nettests.go +++ b/nettests/nettests.go @@ -81,7 +81,6 @@ func (c *Controller) Init(nt *mk.Nettest) error { reportFilePath := c.msmtPath geoIPCountryPath := filepath.Join(utils.GeoIPDir(c.Ctx.Home), "GeoLite2-Country.mmdb") geoIPASNPath := filepath.Join(utils.GeoIPDir(c.Ctx.Home), "GeoLite2-ASN.mmdb") - caBundlePath := getCaBundlePath() msmtPath := c.msmtPath log.Debugf("OutputPath: %s", msmtPath) From 23423cd74f3f45a2099efa6c2f35b44703ed9bf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arturo=20Filast=C3=B2?= Date: Thu, 16 May 2019 10:22:29 +0200 Subject: [PATCH 4/4] Put MK loglevel to info --- nettests/nettests.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nettests/nettests.go b/nettests/nettests.go index 8ad5f0f..da8d932 100644 --- a/nettests/nettests.go +++ b/nettests/nettests.go @@ -88,7 +88,7 @@ func (c *Controller) Init(nt *mk.Nettest) error { IncludeIP: c.Ctx.Config.Sharing.IncludeIP, IncludeASN: c.Ctx.Config.Sharing.IncludeASN, IncludeCountry: c.Ctx.Config.Sharing.IncludeCountry, - LogLevel: "DEBUG", + LogLevel: "INFO", ProbeCC: c.Ctx.Location.CountryCode, ProbeASN: fmt.Sprintf("AS%d", c.Ctx.Location.ASN),