Skip to content
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<kotlin.compiler.jvmTarget>11</kotlin.compiler.jvmTarget>
<jackson.version>2.9.5</jackson.version>
<jackson.version>2.19.4</jackson.version>
<junit.version>5.10.0</junit.version>
<kotest.version>5.7.2</kotest.version>
<mockk.version>1.13.8</mockk.version>
Expand Down
6 changes: 3 additions & 3 deletions src/main/kotlin/org/jitsi/jibri/JibriManager.kt
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ class JibriManager : StatusPublisher<Any>() {
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,
Expand All @@ -149,7 +149,7 @@ class JibriManager : StatusPublisher<Any>() {
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)
Expand All @@ -163,7 +163,7 @@ class JibriManager : StatusPublisher<Any>() {
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(
Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/org/jitsi/jibri/api/xmpp/XmppApi.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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<String> = host.split(":")

// We need to use the host as the ID because we'll only get one MUC client per 'ID' and
Expand Down
6 changes: 3 additions & 3 deletions src/main/kotlin/org/jitsi/jibri/config/JibriConfig.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/org/jitsi/jibri/selenium/JibriSelenium.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
7 changes: 6 additions & 1 deletion src/main/kotlin/org/jitsi/jibri/webhooks/v1/WebhookClient.kt
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ package org.jitsi.jibri.webhooks.v1

import io.ktor.client.HttpClient
import io.ktor.client.engine.apache.Apache
import javax.net.ssl.SSLContext
import io.ktor.client.plugins.HttpRequestTimeoutException
import io.ktor.client.plugins.HttpTimeout
import io.ktor.client.plugins.contentnegotiation.ContentNegotiation
Expand Down Expand Up @@ -49,7 +50,11 @@ import java.util.concurrent.CopyOnWriteArraySet
*/
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<String> = CopyOnWriteArraySet()
Expand Down
Loading