Skip to content

Commit 6c81823

Browse files
authored
Merge pull request #359 from aiven/hacka-removed-extra-entrypoints
Removed extra entrypoints
2 parents 8d53b17 + a7b88fd commit 6c81823

3 files changed

Lines changed: 2 additions & 68 deletions

File tree

container/start.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ case $1 in
2626
echo "{}" > /opt/karapace/rest.config.json
2727

2828
echo "Starting Karapace REST API"
29-
exec python3 -m karapace.kafka_rest_apis /opt/karapace/rest.config.json
29+
exec python3 -m karapace.karapace_all /opt/karapace/rest.config.json
3030
;;
3131
registry)
3232
# Reexport variables for compatibility
@@ -46,7 +46,7 @@ case $1 in
4646
echo "{}" > /opt/karapace/registry.config.json
4747

4848
echo "Starting Karapace Schema Registry"
49-
exec python3 -m karapace.schema_registry_apis /opt/karapace/registry.config.json
49+
exec python3 -m karapace.karapace_all /opt/karapace/registry.config.json
5050
;;
5151
*)
5252
echo "usage: start-karapace.sh <registry|rest>"

karapace/kafka_rest_apis/__main__.py

Lines changed: 0 additions & 34 deletions
This file was deleted.

karapace/schema_registry_apis.py

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,17 @@
11
from avro.errors import SchemaParseException
2-
from contextlib import closing
32
from enum import Enum, unique
43
from http import HTTPStatus
54
from kafka import KafkaProducer
6-
from karapace import version as karapace_version
75
from karapace.compatibility import check_compatibility, CompatibilityModes
86
from karapace.compatibility.jsonschema.checks import is_incompatible
9-
from karapace.config import DEFAULT_LOG_FORMAT_JOURNAL, read_config
107
from karapace.karapace import KarapaceBase
118
from karapace.master_coordinator import MasterCoordinator
129
from karapace.rapu import HTTPRequest
1310
from karapace.schema_reader import InvalidSchema, KafkaSchemaReader, SchemaType, TypedSchema
1411
from karapace.utils import json_encode, KarapaceKafkaClient
1512
from typing import Any, Dict, Optional, Tuple
1613

17-
import argparse
1814
import asyncio
19-
import logging
20-
import sys
2115
import time
2216

2317

@@ -907,29 +901,3 @@ def no_master_error(self, content_type):
907901
content_type=content_type,
908902
status=HTTPStatus.INTERNAL_SERVER_ERROR,
909903
)
910-
911-
912-
def main() -> int:
913-
parser = argparse.ArgumentParser(prog="karapace", description="Karapace: Your Kafka essentials in one tool")
914-
parser.add_argument("--version", action="version", help="show program version", version=karapace_version.__version__)
915-
parser.add_argument("config_file", help="configuration file path", type=argparse.FileType())
916-
arg = parser.parse_args()
917-
918-
with closing(arg.config_file):
919-
config = read_config(arg.config_file)
920-
921-
logging.basicConfig(level=logging.INFO, format=DEFAULT_LOG_FORMAT_JOURNAL)
922-
logging.getLogger().setLevel(config["log_level"])
923-
kc = KarapaceSchemaRegistry(config=config)
924-
try:
925-
kc.run(host=kc.config["host"], port=kc.config["port"])
926-
except Exception: # pylint: disable-broad-except
927-
if kc.raven_client:
928-
kc.raven_client.captureException(tags={"where": "karapace"})
929-
raise
930-
931-
return 0
932-
933-
934-
if __name__ == "__main__":
935-
sys.exit(main())

0 commit comments

Comments
 (0)