mirror of
https://github.com/stashapp/stash.git
synced 2025-12-06 16:34:02 +01:00
b83ce29ac4
* Fix logs from scraper and plugins not being shown in UI Using `logger.` in the logger package to write logs is "incorrect". This as the package contains a variable named `logger` which contains the logrus instance. So instead of the log line being handled by the custom log implementation / wrapper which makes sure the lines are shown in the UI as well, it's written to logrus directly meaning the wrapper is skipped. This "issue" is obviously triggered because in any other place `logger.X` can be used and it will used the custom logger package / wrapper which works fine. * Add plugin / scraper name to logging output Indicate which plugin / scraper wrote a log message by including its name to the `[Scrape]` prefix. * Add missing addLogItem call
101 lines
2 KiB
Go
101 lines
2 KiB
Go
package plugin
|
|
|
|
import (
|
|
"errors"
|
|
"fmt"
|
|
"io"
|
|
"net/rpc"
|
|
"net/rpc/jsonrpc"
|
|
"sync"
|
|
|
|
"github.com/natefinch/pie"
|
|
"github.com/stashapp/stash/pkg/plugin/common"
|
|
)
|
|
|
|
type rpcTaskBuilder struct{}
|
|
|
|
func (*rpcTaskBuilder) build(task pluginTask) Task {
|
|
return &rpcPluginTask{
|
|
pluginTask: task,
|
|
}
|
|
}
|
|
|
|
type rpcPluginClient struct {
|
|
Client *rpc.Client
|
|
}
|
|
|
|
func (p rpcPluginClient) Run(input common.PluginInput, output *common.PluginOutput) error {
|
|
return p.Client.Call("RPCRunner.Run", input, output)
|
|
}
|
|
|
|
func (p rpcPluginClient) RunAsync(input common.PluginInput, output *common.PluginOutput, done chan *rpc.Call) *rpc.Call {
|
|
return p.Client.Go("RPCRunner.Run", input, output, done)
|
|
}
|
|
|
|
func (p rpcPluginClient) Stop() error {
|
|
var resp interface{}
|
|
return p.Client.Call("RPCRunner.Stop", nil, &resp)
|
|
}
|
|
|
|
type rpcPluginTask struct {
|
|
pluginTask
|
|
|
|
started bool
|
|
client *rpc.Client
|
|
waitGroup sync.WaitGroup
|
|
done chan *rpc.Call
|
|
}
|
|
|
|
func (t *rpcPluginTask) Start() error {
|
|
if t.started {
|
|
return errors.New("task already started")
|
|
}
|
|
|
|
command := t.plugin.getExecCommand(t.operation)
|
|
if len(command) == 0 {
|
|
return fmt.Errorf("empty exec value in operation %s", t.operation.Name)
|
|
}
|
|
|
|
pluginErrReader, pluginErrWriter := io.Pipe()
|
|
|
|
var err error
|
|
t.client, err = pie.StartProviderCodec(jsonrpc.NewClientCodec, pluginErrWriter, command[0], command[1:]...)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
go t.handlePluginStderr(t.plugin.Name, pluginErrReader)
|
|
|
|
iface := rpcPluginClient{
|
|
Client: t.client,
|
|
}
|
|
|
|
t.done = make(chan *rpc.Call, 1)
|
|
result := common.PluginOutput{}
|
|
t.waitGroup.Add(1)
|
|
iface.RunAsync(t.input, &result, t.done)
|
|
go t.waitToFinish(&result)
|
|
|
|
t.started = true
|
|
return nil
|
|
}
|
|
|
|
func (t *rpcPluginTask) waitToFinish(result *common.PluginOutput) {
|
|
defer t.client.Close()
|
|
defer t.waitGroup.Done()
|
|
<-t.done
|
|
|
|
t.result = result
|
|
}
|
|
|
|
func (t *rpcPluginTask) Wait() {
|
|
t.waitGroup.Wait()
|
|
}
|
|
|
|
func (t *rpcPluginTask) Stop() error {
|
|
iface := rpcPluginClient{
|
|
Client: t.client,
|
|
}
|
|
|
|
return iface.Stop()
|
|
}
|