From 1a0c9fe7f9f6ac4b6a2450ddc23bad31127c6bfc Mon Sep 17 00:00:00 2001 From: GyoungSu Date: Sun, 8 Sep 2024 15:54:12 +0900 Subject: [PATCH] Remove comment lines --- Dockerfile | 9 --------- log/log.go | 3 +++ 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index 25ca32c..445c8d8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,13 +6,7 @@ RUN apt-get upgrade -y RUN apt-get install -y build-essential git pkg-config libunistring-dev libaom-dev libdav1d-dev bzip2 nasm wget yasm ca-certificates COPY install-ffmpeg.sh /install-ffmpeg.sh RUN chmod +x /install-ffmpeg.sh && /install-ffmpeg.sh -# 로컬에서 테스트하기 위한 workspace container -# 1. ffmpeg build를 위한 환경 설정 ENV PKG_CONFIG_PATH=/ffmpeg_build/lib/pkgconfig:${PKG_CONFIG_PATH} -#ENV LD_LIBRARY_PATH=/openh264/lib -# Install dependencies - -#COPY --from=build /usr/local/go /usr/local/go ENV PATH="/usr/local/go/bin:${PATH}" COPY ./ /app WORKDIR /app @@ -25,6 +19,3 @@ RUN cp index.html /app/bin/index.html RUN mkdir /app/bin/videos WORKDIR /app/bin ENTRYPOINT ["/app/bin/liveflow"] - - -#ENTRYPOINT ["pkg-config", "--cflags", "--libs", "libavcodec", "libavformat", "libavutil", "libswscale"] \ No newline at end of file diff --git a/log/log.go b/log/log.go index e308640..1cca128 100644 --- a/log/log.go +++ b/log/log.go @@ -39,6 +39,9 @@ func SetLevel(ctx context.Context, level logrus.Level) { func Init() { //logrus.AddHook(&SkipHook{skip: 7}) + logrus.SetFormatter(&logrus.TextFormatter{ + FullTimestamp: true, + }) } func SetFormatter(ctx context.Context, formatter logrus.Formatter) {