Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ jobs:
- name: Install dependencies
run: go get .
- name: Test with Go
run: go test
run: go test ./...
8 changes: 7 additions & 1 deletion internal/event/grouped-listeners.json → internal/event/console.sh
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#!/bin/bash
json=$(cat << EOF
{
"event1": [
{
Expand All @@ -11,4 +13,8 @@
"type": "async"
}
]
}
}
EOF
)

echo $json
14 changes: 7 additions & 7 deletions internal/event/event.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@ func (listenerReader *ListenerReader) GetAll() []Listener {
return ungroupedListeners
}

func NewListenerReader(command string) ListenerReaderInterface {
func NewListenerReader(pathToConsoleApp string) ListenerReaderInterface {
return &ListenerReader{
command: command,
command: fmt.Sprintf("%s event:listener:get async", pathToConsoleApp),
}
}

Expand All @@ -60,14 +60,14 @@ type ListenerConverterInterface interface {
}

type ListenerConverter struct {
command string
pathToConsoleApp string
}

func (listenerConverter *ListenerConverter) ConvertToProcess(listener Listener) process.ProcessInterface {
return process.NewProcess(
fmt.Sprintf(
"%s %s %s",
listenerConverter.command,
"%s event:queue:consume %s %s",
listenerConverter.pathToConsoleApp,
listener.EventName,
listener.Identifier,
),
Expand All @@ -84,8 +84,8 @@ func (listenerConverter *ListenerConverter) ConvertMultipleToProcesses(listeners
return processes
}

func NewListenerConverter(command string) ListenerConverterInterface {
func NewListenerConverter(pathToConsoleApp string) ListenerConverterInterface {
return &ListenerConverter{
command: command,
pathToConsoleApp: pathToConsoleApp,
}
}
2 changes: 1 addition & 1 deletion internal/event/event_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
)

func TestGetAll(t *testing.T) {
listenerReader := NewListenerReader("cat ./grouped-listeners.json")
listenerReader := NewListenerReader("./console.sh")
listeners := listenerReader.GetAll()

if len(listeners) != 2 {
Expand Down
6 changes: 3 additions & 3 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ func main() {
jellyfishApplicationDir = os.Args[1]
}

consoleCommand := fmt.Sprintf("%s/vendor/bin/console", strings.TrimRight(jellyfishApplicationDir, "/"))
pathToConsoleApp := fmt.Sprintf("%s/vendor/bin/console", strings.TrimRight(jellyfishApplicationDir, "/"))

listenerReader := event.NewListenerReader(consoleCommand)
listenerReader := event.NewListenerReader(pathToConsoleApp)
listeners := listenerReader.GetAll()
listenerConverter := event.NewListenerConverter(consoleCommand)
listenerConverter := event.NewListenerConverter(pathToConsoleApp)
processes := listenerConverter.ConvertMultipleToProcesses(listeners)
eventQueueWorker := worker.NewEventQueueWorker(processes)

Expand Down