diff --git a/pom.xml b/pom.xml
index 3c322ea6..75a35898 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
11
11
11
- 2.9.5
+ 2.19.4
5.10.0
5.7.2
1.13.8
diff --git a/src/main/kotlin/org/jitsi/jibri/JibriManager.kt b/src/main/kotlin/org/jitsi/jibri/JibriManager.kt
index cbf46e35..76260027 100644
--- a/src/main/kotlin/org/jitsi/jibri/JibriManager.kt
+++ b/src/main/kotlin/org/jitsi/jibri/JibriManager.kt
@@ -125,7 +125,10 @@ class JibriManager : StatusPublisher() {
serviceStatusHandler: JibriServiceStatusHandler? = null
) {
throwIfBusy(RecordingSinkType.FILE)
- logger.info("Starting a file recording with params: $fileRecordingRequestParams")
+ logger.info(
+ "Starting a file recording, sessionId=${fileRecordingRequestParams.sessionId}, " +
+ "call=${fileRecordingRequestParams.callParams}"
+ )
val service = FileRecordingJibriService(
FileRecordingParams(
fileRecordingRequestParams.callParams,
@@ -149,7 +152,7 @@ class JibriManager : StatusPublisher() {
environmentContext: EnvironmentContext? = null,
serviceStatusHandler: JibriServiceStatusHandler? = null
) {
- logger.info("Starting a stream with params: $serviceParams $streamingParams")
+ logger.info("Starting a stream, sessionId=${streamingParams.sessionId}, call=${streamingParams.callParams}")
throwIfBusy(RecordingSinkType.STREAM)
val service = StreamingJibriService(streamingParams)
jibriMetrics.start(RecordingSinkType.STREAM)
@@ -163,7 +166,7 @@ class JibriManager : StatusPublisher() {
environmentContext: EnvironmentContext? = null,
serviceStatusHandler: JibriServiceStatusHandler? = null
) {
- logger.info("Starting a SIP gateway with params: $serviceParams $sipGatewayServiceParams")
+ logger.info("Starting a SIP gateway, call=${sipGatewayServiceParams.callParams}")
throwIfBusy(RecordingSinkType.GATEWAY)
val service = SipGatewayJibriService(
SipGatewayServiceParams(
diff --git a/src/main/kotlin/org/jitsi/jibri/api/xmpp/XmppApi.kt b/src/main/kotlin/org/jitsi/jibri/api/xmpp/XmppApi.kt
index f71faf1d..44222c5d 100644
--- a/src/main/kotlin/org/jitsi/jibri/api/xmpp/XmppApi.kt
+++ b/src/main/kotlin/org/jitsi/jibri/api/xmpp/XmppApi.kt
@@ -146,7 +146,7 @@ class XmppApi(
// Join all the MUCs we've been told to
for (config in xmppConfigs) {
for (host in config.xmppServerHosts) {
- logger.info("Connecting to xmpp environment on $host with config $config")
+ logger.info("Connecting to xmpp environment '${config.name}' on $host")
val hostDetails: List = host.split(":")
// We need to use the host as the ID because we'll only get one MUC client per 'ID' and
diff --git a/src/main/kotlin/org/jitsi/jibri/config/JibriConfig.kt b/src/main/kotlin/org/jitsi/jibri/config/JibriConfig.kt
index 790b71c1..c8bb9493 100644
--- a/src/main/kotlin/org/jitsi/jibri/config/JibriConfig.kt
+++ b/src/main/kotlin/org/jitsi/jibri/config/JibriConfig.kt
@@ -21,8 +21,8 @@ import com.fasterxml.jackson.annotation.JsonInclude
import com.fasterxml.jackson.annotation.JsonProperty
import com.fasterxml.jackson.core.JsonParser
import com.fasterxml.jackson.databind.exc.InvalidFormatException
+import com.fasterxml.jackson.databind.exc.MismatchedInputException
import com.fasterxml.jackson.databind.exc.UnrecognizedPropertyException
-import com.fasterxml.jackson.module.kotlin.MissingKotlinParameterException
import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
import com.fasterxml.jackson.module.kotlin.readValue
import org.jitsi.jibri.logger
@@ -192,9 +192,9 @@ fun loadConfigFromFile(configFile: File): JibriConfig? {
val config: JibriConfig = jacksonObjectMapper()
.configure(JsonParser.Feature.ALLOW_COMMENTS, true)
.readValue(configFile)
- logger.info("Parsed legacy config:\n$config")
+ logger.info("Successfully parsed legacy config")
config
- } catch (e: MissingKotlinParameterException) {
+ } catch (e: MismatchedInputException) {
logger.error("A required config parameter was missing: ${e.originalMessage}")
null
} catch (e: UnrecognizedPropertyException) {
diff --git a/src/main/kotlin/org/jitsi/jibri/selenium/JibriSelenium.kt b/src/main/kotlin/org/jitsi/jibri/selenium/JibriSelenium.kt
index 750c5786..719e9d65 100644
--- a/src/main/kotlin/org/jitsi/jibri/selenium/JibriSelenium.kt
+++ b/src/main/kotlin/org/jitsi/jibri/selenium/JibriSelenium.kt
@@ -189,7 +189,7 @@ class JibriSelenium(
* Set up default chrome driver options (using fake device, etc.)
*/
init {
- System.setProperty("webdriver.chrome.logfile", "/tmp/chromedriver.log")
+ System.setProperty("webdriver.chrome.logfile", "/var/log/jitsi/jibri/chromedriver.log")
val chromeOptions = ChromeOptions()
chromeOptions.addArguments(chromeOpts)
chromeOptions.setExperimentalOption("w3c", false)
diff --git a/src/main/kotlin/org/jitsi/jibri/webhooks/v1/WebhookClient.kt b/src/main/kotlin/org/jitsi/jibri/webhooks/v1/WebhookClient.kt
index 332180e5..7ba5a5c6 100644
--- a/src/main/kotlin/org/jitsi/jibri/webhooks/v1/WebhookClient.kt
+++ b/src/main/kotlin/org/jitsi/jibri/webhooks/v1/WebhookClient.kt
@@ -43,13 +43,18 @@ import org.jitsi.jwt.RefreshingJwt
import org.jitsi.metaconfig.optionalconfig
import org.jitsi.utils.logging2.createLogger
import java.util.concurrent.CopyOnWriteArraySet
+import javax.net.ssl.SSLContext
/**
* A client for notifying subscribers of Jibri events
*/
class WebhookClient(
private val jibriId: String,
- client: HttpClient = HttpClient(Apache)
+ client: HttpClient = HttpClient(Apache) {
+ engine {
+ sslContext = SSLContext.getDefault()
+ }
+ }
) {
private val logger = createLogger()
private val webhookSubscribers: MutableSet = CopyOnWriteArraySet()