scripts now log to process 1 and therefore to docker logs
This commit is contained in:
16
Dockerfile
16
Dockerfile
@@ -1,7 +1,19 @@
|
|||||||
FROM debian:bookworm-slim
|
FROM debian:bookworm-slim
|
||||||
|
|
||||||
ENV DEBIAN_FRONTEND=noninteractive
|
ENV PYTHONUNBUFFERED=1
|
||||||
RUN apt update && apt install -y vim cron tzdata python3-openpyxl python3-selenium python3-pyvirtualdisplay && rm -rf /var/lib/apt/lists/*
|
|
||||||
|
ARG DEBIAN_FRONTEND=noninteractive
|
||||||
|
RUN apt update \
|
||||||
|
&& apt -y upgrade\
|
||||||
|
&& apt -y install \
|
||||||
|
vim \
|
||||||
|
cron \
|
||||||
|
tzdata \
|
||||||
|
python3-openpyxl \
|
||||||
|
python3-selenium \
|
||||||
|
python3-pyvirtualdisplay \
|
||||||
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
RUN cp -r -f /usr/share/zoneinfo/Europe/Berlin /etc/localtime
|
RUN cp -r -f /usr/share/zoneinfo/Europe/Berlin /etc/localtime
|
||||||
|
|
||||||
COPY /parser.py /app/
|
COPY /parser.py /app/
|
||||||
|
|||||||
@@ -1,3 +1,3 @@
|
|||||||
# m h dom mon dow cmd
|
# m h dom mon dow cmd
|
||||||
*/5 8-20 * * 1-5 cd /app/ && ./parser.py
|
*/5 8-20 * * 1-5 cd /app/ && ./parser.py &> /proc/1/fd/1
|
||||||
0 0 * * * /app/kill-chrome.sh
|
0 0 * * * /app/kill-chrome.sh
|
||||||
|
|||||||
13
parser.py
13
parser.py
@@ -27,7 +27,8 @@ def fetch_via_browser(newfile):
|
|||||||
"download.default_directory" : set['files'],
|
"download.default_directory" : set['files'],
|
||||||
"profile.default_content_settings.popups" : 0,
|
"profile.default_content_settings.popups" : 0,
|
||||||
}
|
}
|
||||||
log.debug("prefs: " + prefs)
|
log.debug("CHROMIUM PREFS:")
|
||||||
|
log.debug(prefs)
|
||||||
options.add_experimental_option("prefs", prefs)
|
options.add_experimental_option("prefs", prefs)
|
||||||
options.add_argument("--headless")
|
options.add_argument("--headless")
|
||||||
options.add_argument("--disable-dev-shm-usage")
|
options.add_argument("--disable-dev-shm-usage")
|
||||||
@@ -200,15 +201,15 @@ log = logging.getLogger()
|
|||||||
log.setLevel(set['loglevel'])
|
log.setLevel(set['loglevel'])
|
||||||
log_format = logging.Formatter('[dw-parser] %(asctime)s - %(levelname)s: %(message)s')
|
log_format = logging.Formatter('[dw-parser] %(asctime)s - %(levelname)s: %(message)s')
|
||||||
|
|
||||||
handler_stdout = logging.StreamHandler(sys.stdout)
|
# handler_stdout = logging.StreamHandler(stream="/proc/1/fd/1")
|
||||||
handler_stdout.setLevel(set['loglevel'])
|
# handler_stdout.setLevel(set['loglevel'])
|
||||||
handler_stdout.setFormatter(log_format)
|
# handler_stdout.setFormatter(log_format)
|
||||||
|
|
||||||
handler_file = logging.FileHandler(set['logfile'])
|
handler_file = logging.FileHandler("/proc/1/fd/1")
|
||||||
handler_file.setLevel(set['loglevel'])
|
handler_file.setLevel(set['loglevel'])
|
||||||
handler_file.setFormatter(log_format)
|
handler_file.setFormatter(log_format)
|
||||||
|
|
||||||
log.addHandler(handler_stdout)
|
# log.addHandler(handler_stdout)
|
||||||
log.addHandler(handler_file)
|
log.addHandler(handler_file)
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
|
|||||||
Reference in New Issue
Block a user