Dockerfile creates volumes for secrets & logs

- Renamed logs folder to kebab-case
- All logger error variables renamed to err
This commit is contained in:
2022-12-17 15:55:51 +01:00
parent 9486ad1069
commit 74abc01ec6
2 changed files with 15 additions and 7 deletions

View File

@@ -16,6 +16,14 @@ EXPOSE 8000
RUN apk add --no-cache ca-certificates
RUN mkdir -p /etc/secrets
VOLUME /etc/secrets
RUN mkdir -p /var/log/planetposen-logs
VOLUME /var/log/planetposen-logs
COPY --from=builder /go/src/github.com/kevinmidboe/planetposen-images .
ENV GOOGLE_APPLICATION_CREDENTIALS=/etc/secrets/sa-key.json
CMD ["./main"]

View File

@@ -22,7 +22,7 @@ func InitLogger() *ApplicationLogger {
var baseLogger = logrus.New()
var applicationLogger = &ApplicationLogger{baseLogger}
f, _ := os.OpenFile("/var/log/planetposen_logs/planetposen-images.log", os.O_RDWR|os.O_CREATE|os.O_APPEND, 0666)
f, _ := os.OpenFile("/var/log/planetposen-logs/planetposen-images.log", os.O_RDWR|os.O_CREATE|os.O_APPEND, 0666)
applicationLogger.SetOutput(f)
applicationLogger.Formatter = &logrus.JSONFormatter{
@@ -72,25 +72,25 @@ func (l *ApplicationLogger) UploadSuccessMessage(path string, url string) {
}).Info("Uploaded and available")
}
func (l *ApplicationLogger) Error(message string, error error) {
func (l *ApplicationLogger) Error(message string, err error) {
l.WithFields(logrus.Fields{
"application": "planetposen-images",
"err": error,
"err": err,
}).Error(message)
}
func (l *ApplicationLogger) Fatal(error error) {
func (l *ApplicationLogger) Fatal(err error) {
l.WithFields(logrus.Fields{
"application": "planetposen-images",
"err": error,
"err": err,
}).Fatal("Fatal application exception!")
}
func (l *ApplicationLogger) GoogleApiError(message string, error error) {
func (l *ApplicationLogger) GoogleApiError(message string, err error) {
l.WithFields(logrus.Fields{
"application": "planetposen-images",
"go_package": "cloud.google.com/go/storage",
"err": error,
"err": err,
}).Error(message)
}