Mirrors/stash
1
0
Fork 0
mirror of https://github.com/stashapp/stash.git synced 2025-12-16 20:07:05 +03:00
Code Issues Packages Projects Releases Wiki Activity

Add JS plugin name to the log line (#4867)

Browse Source
This commit is contained in:
puc9
2024-05-22 15:05:12 -07:00
committed by GitHub
parent 99d97804f4
commit 77ef16570b
2 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
pkg/javascript/log.go
View File

@@ -10,10 +10,14 @@ import (
"github.com/stashapp/stash/pkg/logger" "github.com/stashapp/stash/pkg/logger"
) )
const pluginPrefix = "[Plugin] " // Log provides log wrappers for usable from the JS VM.
type Log struct { type Log struct {
Progress chan float64 // Logger is the LoggerImpl to forward log messages to.
Logger logger.LoggerImpl
// Prefix is the prefix to prepend to log messages.
Prefix string
// ProgressChan is a channel that receives float64s indicating the current progress of an operation.
ProgressChan chan float64
} }
func (l *Log) argToString(call goja.FunctionCall) string { func (l *Log) argToString(call goja.FunctionCall) string {
@@ -33,27 +37,27 @@ func (l *Log) argToString(call goja.FunctionCall) string {
} }
func (l *Log) logTrace(call goja.FunctionCall) goja.Value { func (l *Log) logTrace(call goja.FunctionCall) goja.Value {
logger.Trace(pluginPrefix + l.argToString(call)) l.Logger.Trace(l.Prefix, l.argToString(call))
return nil return nil
} }
func (l *Log) logDebug(call goja.FunctionCall) goja.Value { func (l *Log) logDebug(call goja.FunctionCall) goja.Value {
logger.Debug(pluginPrefix + l.argToString(call)) l.Logger.Debug(l.Prefix, l.argToString(call))
return nil return nil
} }
func (l *Log) logInfo(call goja.FunctionCall) goja.Value { func (l *Log) logInfo(call goja.FunctionCall) goja.Value {
logger.Info(pluginPrefix + l.argToString(call)) l.Logger.Info(l.Prefix, l.argToString(call))
return nil return nil
} }
func (l *Log) logWarn(call goja.FunctionCall) goja.Value { func (l *Log) logWarn(call goja.FunctionCall) goja.Value {
logger.Warn(pluginPrefix + l.argToString(call)) l.Logger.Warn(l.Prefix, l.argToString(call))
return nil return nil
} }
func (l *Log) logError(call goja.FunctionCall) goja.Value { func (l *Log) logError(call goja.FunctionCall) goja.Value {
logger.Error(pluginPrefix + l.argToString(call)) l.Logger.Error(l.Prefix, l.argToString(call))
return nil return nil
} }
@@ -62,7 +66,7 @@ func (l *Log) logError(call goja.FunctionCall) goja.Value {
// complete. Values outside of this range will be clamp to be within it. // complete. Values outside of this range will be clamp to be within it.
func (l *Log) logProgress(value float64) { func (l *Log) logProgress(value float64) {
value = math.Min(math.Max(0, value), 1) value = math.Min(math.Max(0, value), 1)
l.Progress <- value l.ProgressChan <- value
} }
func (l *Log) AddToVM(globalName string, vm *VM) error { func (l *Log) AddToVM(globalName string, vm *VM) error {

7
pkg/plugin/js.go
View File

@@ -9,6 +9,7 @@ import (
"github.com/dop251/goja" "github.com/dop251/goja"
"github.com/stashapp/stash/pkg/javascript" "github.com/stashapp/stash/pkg/javascript"
"github.com/stashapp/stash/pkg/logger"
"github.com/stashapp/stash/pkg/plugin/common" "github.com/stashapp/stash/pkg/plugin/common"
) )
@@ -73,8 +74,12 @@ func (t *jsPluginTask) initVM() error {
return fmt.Errorf("error setting input: %w", err) return fmt.Errorf("error setting input: %w", err)
} }
const pluginPrefix = "[Plugin / %s] "
log := &javascript.Log{ log := &javascript.Log{
Progress: t.progress, Logger: logger.Logger,
Prefix: fmt.Sprintf(pluginPrefix, t.plugin.Name),
ProgressChan: t.progress,
} }
if err := log.AddToVM("log", t.vm); err != nil { if err := log.AddToVM("log", t.vm); err != nil {