Fix consent checks (#272)

* fix: Fix sending consent checks (wrong property name).

* log: Log exceptions from PeriodicRunnable.
This commit is contained in:
bgrozev 2023-10-02 09:38:14 -05:00 committed by GitHub
parent 27ad37d1af
commit fd43e6c181
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 11 deletions

View File

@ -21,7 +21,6 @@ import org.ice4j.*;
import org.ice4j.ice.harvest.*; import org.ice4j.ice.harvest.*;
import org.ice4j.stack.*; import org.ice4j.stack.*;
import org.ice4j.util.PeriodicRunnable; import org.ice4j.util.PeriodicRunnable;
import org.jitsi.utils.collections.*;
import org.jitsi.utils.concurrent.*; import org.jitsi.utils.concurrent.*;
import org.jitsi.utils.logging2.Logger; import org.jitsi.utils.logging2.Logger;
import org.jitsi.utils.logging2.*; import org.jitsi.utils.logging2.*;
@ -70,15 +69,6 @@ public class Agent
private static final PropertyChangeListener[] NO_STATE_CHANGE_LISTENERS private static final PropertyChangeListener[] NO_STATE_CHANGE_LISTENERS
= new PropertyChangeListener[0]; = new PropertyChangeListener[0];
/**
* The {@link Logger} used by the {@link Agent} class for logging output.
* Note that this shouldn't be used directly by instances of {@link Agent},
* because it doesn't take into account the per-instance log level.
* Instances should use {@link #logger} instead.
*/
private static final java.util.logging.Logger classLogger
= java.util.logging.Logger.getLogger(Agent.class.getName());
/** /**
* The name of the {@link PropertyChangeEvent} that we use to deliver * The name of the {@link PropertyChangeEvent} that we use to deliver
* events on changes in the state of ICE processing in this agent. * events on changes in the state of ICE processing in this agent.

View File

@ -1,5 +1,7 @@
package org.ice4j.util; package org.ice4j.util;
import org.jitsi.utils.logging2.*;
import java.time.*; import java.time.*;
import java.util.concurrent.*; import java.util.concurrent.*;
@ -11,6 +13,11 @@ import java.util.concurrent.*;
*/ */
public abstract class PeriodicRunnable public abstract class PeriodicRunnable
{ {
/**
* The {@link Logger} used by the {@link PeriodicRunnable} class for logging output.
*/
private final static Logger logger = new LoggerImpl(PeriodicRunnable.class.getName());
/** /**
* A timer to perform periodic scheduling of {@link #run()} execution * A timer to perform periodic scheduling of {@link #run()} execution
* on {@link #executor}'s thread. * on {@link #executor}'s thread.
@ -205,6 +212,10 @@ public abstract class PeriodicRunnable
{ {
this.run(); this.run();
} }
catch (Exception e)
{
logger.warn("Exception in run(), will retry.", e);
}
finally finally
{ {
if (running) if (running)

View File

@ -28,7 +28,7 @@ class AgentConfig {
} }
val randomizeConsentFreshnessInterval: Boolean by config { val randomizeConsentFreshnessInterval: Boolean by config {
"ice4j.consent-freshness.randomize".from(configSource) "ice4j.consent-freshness.randomize-interval".from(configSource)
} }
val consentFreshnessOriginalWaitInterval: Duration by config { val consentFreshnessOriginalWaitInterval: Duration by config {