diff options
| author | Alexander Færøy <ahf@torproject.org> | 2020-10-13 13:50:14 +0000 |
|---|---|---|
| committer | Alexander Færøy <ahf@torproject.org> | 2020-10-13 13:50:14 +0000 |
| commit | 78aa037c4191edf4231502d5584f9e1ed4834bca (patch) | |
| tree | baf5f81e64b5f4980c12725356b9c770fe3bfbc4 /src/app/config | |
| parent | 5d23881770161cc9aa50fa3f2595061057d1bcca (diff) | |
| parent | 458897e3c524db92caa579d35c9d3494c7bfd733 (diff) | |
| download | tor-78aa037c4191edf4231502d5584f9e1ed4834bca.tar.gz tor-78aa037c4191edf4231502d5584f9e1ed4834bca.zip | |
Merge remote-tracking branch 'tor-gitlab/mr/161'
Diffstat (limited to 'src/app/config')
| -rw-r--r-- | src/app/config/config.c | 16 | ||||
| -rw-r--r-- | src/app/config/or_options_st.h | 1 |
2 files changed, 10 insertions, 7 deletions
diff --git a/src/app/config/config.c b/src/app/config/config.c index 0706a0dbdc..817af22359 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -548,7 +548,7 @@ static const config_var_t option_vars_[] = { V(LogTimeGranularity, MSEC_INTERVAL, "1 second"), V(TruncateLogFile, BOOL, "0"), V_IMMUTABLE(SyslogIdentityTag, STRING, NULL), - V_IMMUTABLE(AndroidIdentityTag,STRING, NULL), + OBSOLETE("AndroidIdentityTag"), V(LongLivedPorts, CSV, "21,22,706,1863,5050,5190,5222,5223,6523,6667,6697,8300"), VAR("MapAddress", LINELIST, AddressMap, NULL), @@ -4935,15 +4935,19 @@ options_init_logs(const or_options_t *old_options, const or_options_t *options, goto cleanup; } + /* We added this workaround in 0.4.5.x; we can remove it in 0.4.6 or + * later */ if (!strcasecmp(smartlist_get(elts, 0), "android")) { -#ifdef HAVE_ANDROID_LOG_H +#ifdef HAVE_SYSLOG_H + log_warn(LD_CONFIG, "The android logging API is no longer supported;" + " adding a syslog instead. The 'android' logging " + " type will no longer work in the future."); if (!validate_only) { - add_android_log(severity, options->AndroidIdentityTag); + add_syslog_log(severity, options->SyslogIdentityTag); } #else - log_warn(LD_CONFIG, "Android logging is not supported" - " on this system. Sorry."); -#endif /* defined(HAVE_ANDROID_LOG_H) */ + log_warn(LD_CONFIG, "The android logging API is no longer supported."); +#endif goto cleanup; } } diff --git a/src/app/config/or_options_st.h b/src/app/config/or_options_st.h index 7f201b8dd7..d19afcb3f6 100644 --- a/src/app/config/or_options_st.h +++ b/src/app/config/or_options_st.h @@ -77,7 +77,6 @@ struct or_options_t { int TruncateLogFile; /**< Boolean: Should we truncate the log file before we start writing? */ char *SyslogIdentityTag; /**< Identity tag to add for syslog logging. */ - char *AndroidIdentityTag; /**< Identity tag to add for Android logging. */ char *DebugLogFile; /**< Where to send verbose log messages. */ char *DataDirectory_option; /**< Where to store long-term data, as |