Skip to content

Commit 701c46b

Browse files
Ashish Singhgwenshap
Ashish Singh
authored andcommitted
KAFKA-2671: Enable starting Kafka server with a Properties object
Author: Ashish Singh <[email protected]> Reviewers: Eno Thereska, Gwen Shapira Closes apache#330 from SinghAsDev/KAFKA-2671
1 parent aa56dfb commit 701c46b

File tree

2 files changed

+15
-8
lines changed

2 files changed

+15
-8
lines changed

Diff for: core/src/main/scala/kafka/Kafka.scala

+5-7
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ package kafka
1919

2020
import java.util.Properties
2121

22-
import scala.collection.JavaConversions._
2322
import joptsimple.OptionParser
24-
import metrics.KafkaMetricsReporter
25-
import server.{KafkaConfig, KafkaServerStartable, KafkaServer}
26-
import kafka.utils.{VerifiableProperties, CommandLineUtils, Logging}
23+
import kafka.server.{KafkaServer, KafkaServerStartable}
24+
import kafka.utils.{CommandLineUtils, Logging}
2725
import org.apache.kafka.common.utils.Utils
2826

27+
import scala.collection.JavaConversions._
28+
2929
object Kafka extends Logging {
3030

3131
def getPropsFromArgs(args: Array[String]): Properties = {
@@ -55,9 +55,7 @@ object Kafka extends Logging {
5555
def main(args: Array[String]): Unit = {
5656
try {
5757
val serverProps = getPropsFromArgs(args)
58-
val serverConfig = KafkaConfig.fromProps(serverProps)
59-
KafkaMetricsReporter.startReporters(new VerifiableProperties(serverProps))
60-
val kafkaServerStartable = new KafkaServerStartable(serverConfig)
58+
val kafkaServerStartable = KafkaServerStartable.fromProps(serverProps)
6159

6260
// attach shutdown handler to catch control-c
6361
Runtime.getRuntime().addShutdownHook(new Thread() {

Diff for: core/src/main/scala/kafka/server/KafkaServerStartable.scala

+10-1
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,17 @@
1717

1818
package kafka.server
1919

20-
import kafka.utils.Logging
20+
import java.util.Properties
2121

22+
import kafka.metrics.KafkaMetricsReporter
23+
import kafka.utils.{VerifiableProperties, Logging}
24+
25+
object KafkaServerStartable {
26+
def fromProps(serverProps: Properties) = {
27+
KafkaMetricsReporter.startReporters(new VerifiableProperties(serverProps))
28+
new KafkaServerStartable(KafkaConfig.fromProps(serverProps))
29+
}
30+
}
2231

2332
class KafkaServerStartable(val serverConfig: KafkaConfig) extends Logging {
2433
private val server = new KafkaServer(serverConfig)

0 commit comments

Comments
 (0)