8000 Revert "DEBUG" · localstack/localstack@be62112 · GitHub
[go: up one dir, main page]

Skip to content < 8000 react-partial partial-name="keyboard-shortcuts-dialog" data-ssr="false" data-attempted-ssr="false" data-react-profiling="false" >

Commit be62112

Browse files
Revert "DEBUG"
This reverts commit 4a865d8.
1 parent 4a865d8 commit be62112

File tree

4 files changed

+3
-23
lines changed

4 files changed

+3
-23
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ RUN SETUPTOOLS_SCM_PRETEND_VERSION_FOR_LOCALSTACK_CORE=${LOCALSTACK_BUILD_VERSIO
154154
RUN --mount=type=cache,target=/root/.cache \
155155
--mount=type=cache,target=/var/lib/localstack/cache \
156156
source .venv/bin/activate && \
157-
DEBUG=1 python -m localstack.cli.lpm install \
157+
python -m localstack.cli.lpm install \
158158
lambda-runtime \
159159
dynamodb-local && \
160160
chown -R localstack:localstack /usr/lib/localstack && \

localstack-core/localstack/packages/api.py

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -115,22 +115,9 @@ def get_installed_dir(self) -> str | None:
115115
and version.
116116
:return: str representation of the installation directory path or None if the package is not installed anywhere
117117
"""
118-
LOG.warning("Getting installed dir for %s", self.name)
119118
for target in InstallTarget:
120119
directory = self._get_install_dir(target)
121-
LOG.warning(
122-
"target %s dir %s marker path %s",
123-
target,
124-
directory,
125-
self._get_install_marker_path(directory),
126-
)
127-
try:
128-
LOG.warning(os.listdir(directory))
129-
except Exception:
130-
LOG.exception("Error listing dir")
131-
132120
if directory and os.path.exists(self._get_install_marker_path(directory)):
133-
LOG.warning("Returning installed dir for %s as %s", self.name, directory)
134121
return directory
135122

136123
def _get_install_dir(self, target: InstallTarget) -> str:

localstack-core/localstack/packages/java.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ def _get_download_url(self) -> str:
4343

4444
def _post_process(self, target: InstallTarget) -> None:
4545
target_directory = self._get_install_dir(target)
46+
minimal_jre_path = os.path.join(target.value, self.name, f"{self.version}.minimal")
47+
rm_rf(minimal_jre_path)
4648

4749
# If jlink is not available, use the environment as is
4850
if not os.path.exists(os.path.join(target_directory, "bin", "jlink")):
@@ -51,10 +53,6 @@ def _post_process(self, target: InstallTarget) -> None:
5153

5254
# Build a custom JRE with only the necessary bits to minimise disk footprint
5355
LOG.debug("Optimising JRE installation")
54-
55-
minimal_jre_path = os.path.join(target.value, self.name, f"{self.version}.minimal")
56-
rm_rf(minimal_jre_path)
57-
5856
cmd = (
5957
"bin/jlink --add-modules "
6058
# Required modules
@@ -81,7 +79,6 @@ def _post_process(self, target: InstallTarget) -> None:
8179

8280
rm_rf(target_directory)
8381
os.rename(minimal_jre_path, target_directory)
84-
LOG.warning("Contents %s", os.listdir(target_directory))
8582

8683
def get_java_home(self) -> str:
8784
"""

localstack-core/localstack/services/dynamodb/server.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -165,10 +165,6 @@ def do_start_thread(self) -> FuncThread:
165165
"PATH": path,
166166
}
167167

168-
debug_cmd = cmd + ["-version"]
169-
LOG.warning("Debug starts %s %s", cmd, env_vars)
170-
run(debug_cmd, env_vars=env_vars, print_error=False)
171-
172168
LOG.debug("Starting DynamoDB Local: %s", cmd)
173169
t = ShellCommandThread(
174170
cmd,

0 commit comments

Comments
 (0)
0