From: Olivier Sallou Date: Thu, 10 Feb 2022 13:02:15 +0000 (+0000) Subject: change optout to optin strategy for usage reports sent over internet Closes #1005279 X-Git-Tag: archive/raspbian/2.16.0+ds-7+rpi1~1^2~67 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=84e9a187b0f9a95f292c9a640ec20509e02d4c14;p=ncbi-blast%2B.git change optout to optin strategy for usage reports sent over internet Closes #1005279 --- diff --git a/debian/changelog b/debian/changelog index a138ac06..a9e6c84f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +ncbi-blast+ (2.12.0+ds-3) unstable; urgency=medium + + * d/patches/optin_usage_report change usage reports sending over + internet strategy to optin (disabled by default unless specified) + (Closes # 1005279). + + -- Olivier Sallou Thu, 10 Feb 2022 12:17:56 +0000 + ncbi-blast+ (2.12.0+ds-2) unstable; urgency=medium * Clean up spurious release-status comment from 2.12.0+ds-1. diff --git a/debian/patches/optin_usage_report b/debian/patches/optin_usage_report new file mode 100644 index 00000000..47c641c5 --- /dev/null +++ b/debian/patches/optin_usage_report @@ -0,0 +1,47 @@ +Subject: blast+ use optout to send usage reports over internet +Description: this patch change strategy to optin ie user asks + per config/env vars to send reports, else it is disabled by default. + Not a bug by itself but default strategy update to send info over internet. +Author: Olivier Sallou +Last-Updated: 202-02-10 +Forwarded: no +--- a/c++/src/algo/blast/api/blast_usage_report.cpp ++++ b/c++/src/algo/blast/api/blast_usage_report.cpp +@@ -184,6 +184,7 @@ + void CBlastUsageReport::x_CheckBlastUsageEnv() + { + char * blast_usage_env = getenv("BLAST_USAGE_REPORT"); ++ + if(blast_usage_env != NULL){ + bool enable = NStr::StringToBool(blast_usage_env); + if (!enable) { +@@ -192,6 +193,10 @@ + LOG_POST(Info <<"Phone home disabled"); + return ; + } ++ SetEnabled(true); ++ CUsageReportAPI::SetEnabled(true); ++ LOG_POST(Info <<"Phone home enabled"); ++ return; + } + + CNcbiIstrstream empty_stream(kEmptyCStr); +@@ -204,10 +209,15 @@ + LOG_POST(Info <<"Phone home disabled by config setting"); + return ; + } ++ SetEnabled(true); ++ CUsageReportAPI::SetEnabled(true); ++ LOG_POST(Info <<"Phone home enabled by config setting"); ++ return ; + } +- CUsageReportAPI::SetEnabled(true); +- SetEnabled(true); +- LOG_POST(Info <<"Phone home enabled"); ++ // Debian optin by default (do not send reports) ++ CUsageReportAPI::SetEnabled(false); ++ SetEnabled(false); ++ LOG_POST(Info <<"Phone home disabled"); + } + + void CBlastUsageReport::AddParam(EUsageParams p, Int8 val) diff --git a/debian/patches/series b/debian/patches/series index 8df54bb5..e618e55d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ +optin_usage_report enable_clean_after_failed_compile hurd_fixes legacy_rename_rpsblast