Process and utility improvements

app/lib/log/encoder.go

@@ -27,8 +27,8 @@ type customEncoder struct {
 	listeners []ListenerFunc
 }
 
-func newEncoder(cfg zapcore.EncoderConfig, colored bool) *customEncoder {
-	return &customEncoder{Encoder: zapcore.NewJSONEncoder(cfg), colored: colored, pool: buffer.NewPool()}
+func newEncoder(cfg zapcore.EncoderConfig, colored bool, fns ...ListenerFunc) *customEncoder {
+	return &customEncoder{Encoder: zapcore.NewJSONEncoder(cfg), colored: colored, pool: buffer.NewPool(), listeners: fns}
 }
 
 func (e *customEncoder) Clone() zapcore.Encoder {

app/lib/log/logger.go

@@ -20,17 +20,17 @@ var (
 	listenerMU = &sync.Mutex{}
 )
 
-func InitLogging(debug bool) (util.Logger, error) {
+func InitLogging(debug bool, fns ...ListenerFunc) (util.Logger, error) {
 	var logger *zap.Logger
 	var err error
 	lf := util.GetEnv("logging_format")
 	switch {
 	case strings.EqualFold(lf, util.KeyJSON):
 		logger, err = initJSONLogging(getLevel(zap.InfoLevel))
 	case debug:
-		logger, err = initDevLogging(getLevel(zap.DebugLevel))
+		logger, err = initDevLogging(getLevel(zap.DebugLevel), fns...)
 	default:
-		logger, err = initSimpleLogging(getLevel(zap.DebugLevel))
+		logger, err = initSimpleLogging(getLevel(zap.DebugLevel), fns...)
 	}
 	if err != nil {
 		return nil, errors.Wrap(err, "error initializing logging")
@@ -42,9 +42,9 @@ func CreateTestLogger() (util.Logger, error) {
 	return InitLogging(false)
 }
 
-func initDevLogging(lvl zapcore.Level) (*zap.Logger, error) {
+func initDevLogging(lvl zapcore.Level, fns ...ListenerFunc) (*zap.Logger, error) {
 	_ = zap.RegisterEncoder(keyCustom, func(cfg zapcore.EncoderConfig) (zapcore.Encoder, error) {
-		return newEncoder(cfg, runtime.GOOS != "js"), nil
+		return newEncoder(cfg, runtime.GOOS != "js", fns...), nil
 	})
 	config := zap.NewDevelopmentConfig()
 	config.EncoderConfig = zapcore.EncoderConfig{}
@@ -60,9 +60,9 @@ func initJSONLogging(lvl zapcore.Level) (*zap.Logger, error) {
 	return config.Build(zap.AddStacktrace(zap.PanicLevel), zap.AddCaller())
 }
 
-func initSimpleLogging(lvl zapcore.Level) (*zap.Logger, error) {
+func initSimpleLogging(lvl zapcore.Level, fns ...ListenerFunc) (*zap.Logger, error) {
 	_ = zap.RegisterEncoder(keyCustom, func(cfg zapcore.EncoderConfig) (zapcore.Encoder, error) {
-		return createSimpleEncoder(cfg), nil
+		return createSimpleEncoder(cfg, fns...), nil
 	})
 	config := zap.NewDevelopmentConfig()
 	config.EncoderConfig = zapcore.EncoderConfig{}

app/lib/log/simple.go

@@ -3,25 +3,47 @@ package log
 import (
 	"go.uber.org/zap/buffer"
 	"go.uber.org/zap/zapcore"
+
+	"github.com/kyleu/rituals/app/util"
 )
 
 type simpleEncoder struct {
 	zapcore.Encoder
-	pool buffer.Pool
+	pool      buffer.Pool
+	listeners []ListenerFunc
 }
 
-func createSimpleEncoder(cfg zapcore.EncoderConfig) *simpleEncoder {
-	return &simpleEncoder{Encoder: zapcore.NewJSONEncoder(cfg), pool: buffer.NewPool()}
+func createSimpleEncoder(cfg zapcore.EncoderConfig, fns ...ListenerFunc) *simpleEncoder {
+	return &simpleEncoder{Encoder: zapcore.NewJSONEncoder(cfg), pool: buffer.NewPool(), listeners: fns}
 }
 
 func (e *simpleEncoder) Clone() zapcore.Encoder {
 	return &simpleEncoder{Encoder: e.Encoder.Clone(), pool: e.pool}
 }
 
-func (e *simpleEncoder) EncodeEntry(entry zapcore.Entry, _ []zapcore.Field) (*buffer.Buffer, error) {
+func (e *simpleEncoder) EncodeEntry(entry zapcore.Entry, fields []zapcore.Field) (*buffer.Buffer, error) {
+	go func() {
+		e.sendToListeners(entry, fields)
+	}()
 	ret := e.pool.Get()
 	m := levelToColor[entry.Level.String()].Add(entry.Message)
 	ret.AppendString(m)
 	ret.AppendByte('\n')
 	return ret, nil
 }
+
+func (e *simpleEncoder) sendToListeners(entry zapcore.Entry, fields []zapcore.Field) {
+	listenerMU.Lock()
+	defer listenerMU.Unlock()
+	fieldMap := make(util.ValueMap, len(fields))
+	for _, x := range fields {
+		fieldMap[x.Key] = x.Interface
+	}
+	caller := util.ValueMap{"file": entry.Caller.File, "line": entry.Caller.Line, "function": entry.Caller.Function}
+	for _, listener := range e.listeners {
+		l := listener
+		go func() {
+			l(entry.Level.String(), entry.Time, entry.LoggerName, entry.Message, caller, entry.Stack, fieldMap)
+		}()
+	}
+}

app/util/map.go

@@ -97,6 +97,10 @@ func (m ValueMap) WithoutKeys(keys ...string) ValueMap {
 	return ret
 }
 
+func (m ValueMap) AsMap() map[string]any {
+	return m
+}
+
 func (m ValueMap) String() string {
 	return ToJSONCompact(m)
 }

assets/embed.go

@@ -50,3 +50,14 @@ func URL(path string) string {
 	e, _ := Embed(path)
 	return fmt.Sprintf("/assets/%s?hash=%s", path, e.Hash)
 }
+
+func ScriptElement(path string, deferFlag bool) string {
+	if deferFlag {
+		return fmt.Sprintf("<script src=%q defer=\"defer\"></script>", URL(path))
+	}
+	return fmt.Sprintf("<script src=%q></script>", URL(path))
+}
+
+func StylesheetElement(path string) string {
+	return fmt.Sprintf(`<link rel="stylesheet" media="screen" href=%q>`, URL(path))
+}

views/layout/Head.html

@@ -20,6 +20,6 @@
   <link rel="icon" href="{%s assets.URL(`logo.svg`) %}" type="image/svg+xml">
   <style>
     {%s= thm.CSS(2) %}  </style>
-  <link rel="stylesheet" media="screen" href="{%s assets.URL(`client.css`) %}">{% if !ps.NoScript %}
-  <script type="text/javascript" src="{%s assets.URL(`client.js`) %}"></script>{% endif %}
+  {%s= assets.StylesheetElement(`client.css`) %}{% if !ps.NoScript %}
+  {%s= assets.ScriptElement(`client.js`, true) %}{% endif %}
 {% endfunc %}