Skip to content

Commit 821d99c

Browse files
author
Stewart Miles
committed
Fix additional instances of verbose logging enabled in batch mode
Follow up to I0b1f38a3e438bd287aa7f906fc8d278df7321b94 which only enables verbose logging if explicitly enabled via settings or the -gvh_log_debug command line option. Fixes #340 Change-Id: Idf1c507b611a213494ce1fd5ef7ea041226746ff
1 parent 1dd774d commit 821d99c

File tree

4 files changed

+4
-9
lines changed

4 files changed

+4
-9
lines changed

source/AndroidResolver/src/PlayServicesResolver.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2188,9 +2188,7 @@ internal static void DeleteLabeledAssets() {
21882188
/// Called when settings change.
21892189
/// </summary>
21902190
internal static void OnSettingsChanged() {
2191-
PlayServicesSupport.verboseLogging =
2192-
SettingsDialogObj.VerboseLogging ||
2193-
ExecutionEnvironment.InBatchMode;
2191+
PlayServicesSupport.verboseLogging = SettingsDialogObj.VerboseLogging;
21942192
logger.Verbose = SettingsDialogObj.VerboseLogging;
21952193
if (gradleResolver != null) {
21962194
PatchAndroidManifest(GetAndroidApplicationId(), null);

source/IOSResolver/src/IOSResolver.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -893,8 +893,7 @@ public static bool VerboseLoggingEnabled {
893893
get { return settings.GetBool(PREFERENCE_VERBOSE_LOGGING_ENABLED, defaultValue: false); }
894894
set {
895895
settings.SetBool(PREFERENCE_VERBOSE_LOGGING_ENABLED, value);
896-
logger.Level = (value || ExecutionEnvironment.InBatchMode) ?
897-
LogLevel.Verbose : LogLevel.Info;
896+
logger.Level = value ? LogLevel.Verbose : LogLevel.Info;
898897
}
899898
}
900899

source/UnityPackageManagerResolver/src/UnityPackageManagerResolver.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -538,8 +538,7 @@ public static bool VerboseLoggingEnabled {
538538
get { return settings.GetBool(PreferenceVerboseLoggingEnabled, defaultValue: false); }
539539
set {
540540
settings.SetBool(PreferenceVerboseLoggingEnabled, value);
541-
logger.Level = ExecutionEnvironment.InBatchMode || value ?
542-
LogLevel.Verbose : LogLevel.Info;
541+
logger.Level = value ? LogLevel.Verbose : LogLevel.Info;
543542
}
544543
}
545544

source/VersionHandlerImpl/src/VersionHandlerImpl.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2325,8 +2325,7 @@ public static bool VerboseLoggingEnabled {
23252325
defaultValue: false); }
23262326
set {
23272327
settings.SetBool(PREFERENCE_VERBOSE_LOGGING_ENABLED, value);
2328-
logger.Level = System.Environment.CommandLine.Contains("-batchmode") || value ?
2329-
LogLevel.Verbose : LogLevel.Info;
2328+
logger.Level = value ? LogLevel.Verbose : LogLevel.Info;
23302329
}
23312330
}
23322331

0 commit comments

Comments
 (0)