Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-20 02:58:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make our loggers singletons.

Browse Source
This commit is contained in:
Greyson Parrelli
2025-08-04 11:31:45 -04:00
committed by Cody Henthorne
parent ec7a2f734a
commit 26df14124b
10 changed files with 26 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/androidTest/java/org/thoughtcrime/securesms/SignalInstrumentationApplicationContext.kt
View File

@@ -26,7 +26,7 @@ class SignalInstrumentationApplicationContext : ApplicationContext() {
}
override fun initializeLogging() {
Log.initialize({ true }, AndroidLogger(), PersistentLogger(this), inMemoryLogger)
Log.initialize({ true }, AndroidLogger, PersistentLogger.getInstance(this), inMemoryLogger)
SignalProtocolLoggerProvider.setProvider(CustomSignalProtocolLogger())

2
app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
View File

@@ -334,7 +334,7 @@ public class ApplicationContext extends Application implements AppForegroundObse
@VisibleForTesting
protected void initializeLogging() {
Log.initialize(RemoteConfig::internalUser, new AndroidLogger(), new PersistentLogger(this));
Log.initialize(RemoteConfig::internalUser, AndroidLogger.INSTANCE, PersistentLogger.getInstance(this));
SignalProtocolLoggerProvider.setProvider(new CustomSignalProtocolLogger());
SignalProtocolLoggerProvider.initializeLogging(BuildConfig.LIBSIGNAL_LOG_LEVEL);

20
app/src/main/java/org/thoughtcrime/securesms/logging/PersistentLogger.kt
View File

@@ -25,9 +25,7 @@ import java.util.Locale
* - Main thread creates a [LogRequest] object and puts it in a queue
* - The [WriteThread] constantly pulls from that queue, formats the logs, and writes them to the database.
*/
class PersistentLogger(
application: Application
) : Log.Logger() {
class PersistentLogger private constructor(application: Application) : Log.Logger() {
companion object {
private const val LOG_V = "V"
@@ -35,6 +33,22 @@ class PersistentLogger(
private const val LOG_I = "I"
private const val LOG_W = "W"
private const val LOG_E = "E"
@Volatile
private var instance: PersistentLogger? = null
@JvmStatic
fun getInstance(application: Application): PersistentLogger {
if (instance == null) {
synchronized(PersistentLogger::class.java) {
if (instance == null) {
instance = PersistentLogger(application)
}
}
}
return requireNotNull(instance)
}
}
private val logEntries = LogRequests()

2
app/src/main/java/org/thoughtcrime/securesms/providers/AvatarProvider.kt
View File

@@ -78,7 +78,7 @@ class AvatarProvider : BaseContentProvider() {
SignalStore.init(application)
Log.initialize(RemoteConfig::internalUser, AndroidLogger(), PersistentLogger(application))
Log.initialize(RemoteConfig::internalUser, AndroidLogger, PersistentLogger.getInstance(application))
if (!AppDependencies.isInitialized) {
Log.i(TAG, "Initializing AppDependencies.")

2
app/src/spinner/java/org/thoughtcrime/securesms/SpinnerApplicationContext.kt
View File

@@ -87,7 +87,7 @@ class SpinnerApplicationContext : ApplicationContext() {
)
)
Log.initialize({ RemoteConfig.internalUser }, AndroidLogger(), PersistentLogger(this), SpinnerLogger())
Log.initialize({ RemoteConfig.internalUser }, AndroidLogger, PersistentLogger.getInstance(this), SpinnerLogger)
DatabaseMonitor.initialize(object : QueryMonitor {
override fun onSql(sql: String, args: Array<Any>?) {

2
core-util/src/main/java/org/signal/core/util/logging/AndroidLogger.kt
View File

@@ -6,7 +6,7 @@ import java.util.concurrent.Executor
import java.util.concurrent.Executors
@SuppressLint("LogNotSignal")
class AndroidLogger : Log.Logger() {
object AndroidLogger : Log.Logger() {
private val serialExecutor: Executor = Executors.newSingleThreadExecutor { Thread(it, "signal-logcat") }

2
qr/app/src/main/java/org/signal/qrtest/QrMainActivity.kt
View File

@@ -27,7 +27,7 @@ class QrMainActivity : AppCompatActivity() {
@SuppressLint("NewApi", "SetTextI18n")
override fun onCreate(savedInstanceState: Bundle?) {
Log.initialize(
AndroidLogger(),
AndroidLogger,
object : Log.Logger() {
override fun v(tag: String, message: String?, t: Throwable?, keepLonger: Boolean) {
printlnFormatted('v', tag, message, t)

2
spinner/app/src/main/java/org/signal/spinnertest/MainActivity.kt
View File

@@ -33,7 +33,7 @@ class MainActivity : AppCompatActivity() {
emptyMap()
)
Log.initialize(AndroidLogger(), SpinnerLogger())
Log.initialize(AndroidLogger, SpinnerLogger)
object : Thread() {
override fun run() {

2
spinner/lib/src/main/java/org/signal/spinner/SpinnerLogger.kt
View File

@@ -9,7 +9,7 @@ import android.os.Looper
import android.util.Log
import org.signal.core.util.logging.Log.Logger
class SpinnerLogger : Logger() {
object SpinnerLogger : Logger() {
private val cachedThreadString: ThreadLocal<String> = ThreadLocal()

2
video/app/src/main/java/org/thoughtcrime/video/app/MainActivity.kt
View File

@@ -54,7 +54,7 @@ class MainActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
Log.initialize(AndroidLogger())
Log.initialize(AndroidLogger)
val startPlaybackScreen = { saveChoice: Boolean -> proceed(Screen.TEST_PLAYBACK, saveChoice) }
val startTranscodeScreen = { saveChoice: Boolean -> proceed(Screen.TEST_TRANSCODE, saveChoice) }