farhan/fedilogue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added capture type to engine

Browse Source
This commit is contained in:
farhan 2020-12-13 08:26:50 +00:00
parent 7286af9c79
commit fd56285e71
3 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
engine/headers.go
View File

@ -14,6 +14,7 @@ const (
BAD_RESPONSE = 602 BAD_RESPONSE = 602
BAD_NODEINFO = 604 BAD_NODEINFO = 604
UNSUPPORTED_INSTANCE = 605 UNSUPPORTED_INSTANCE = 605
STREAM_ENDED = 606
) )
// Parsing Unmarshal JSON type // Parsing Unmarshal JSON type
@ -43,9 +44,9 @@ type AccountType struct {
// Instance's new min_id value // Instance's new min_id value
type RunningInstance struct { type RunningInstance struct {
Software string `json:"software"` Software string `json:"software"`
Min_id string
Status int `json:"status"` Status int `json:"status"`
LastRun string `json:"lastrun"` LastRun string `json:"lastrun"`
CaptureType string `json:"capturetype"`
} }
type NodeInfoSoftware struct { type NodeInfoSoftware struct {

10
engine/instance.go
View File

@ -74,7 +74,7 @@ func GetNodeInfo(endpoint string) (NodeInfo) {
func StartInstance(endpoint string, reportPostChan chan ReportPost) { func StartInstance(endpoint string, reportPostChan chan ReportPost) {
nodeinfo := GetNodeInfo(endpoint) nodeinfo := GetNodeInfo(endpoint)
if nodeinfo.Software.Name == "" { if nodeinfo.Software.Name == "" {
var m = runninginstances[endpoint] m := runninginstances[endpoint]
m.Software = "" m.Software = ""
m.LastRun = time.Now().Format(time.RFC3339) m.LastRun = time.Now().Format(time.RFC3339)
m.Status = UNSUPPORTED_INSTANCE m.Status = UNSUPPORTED_INSTANCE
@ -84,11 +84,19 @@ func StartInstance(endpoint string, reportPostChan chan ReportPost) {
return return
} }
ri_mutex.Lock()
m := runninginstances[endpoint]
if nodeinfo.Software.Name == "pleroma" { if nodeinfo.Software.Name == "pleroma" {
log.Print("Starting " + endpoint + " as " + nodeinfo.Software.Name) log.Print("Starting " + endpoint + " as " + nodeinfo.Software.Name)
m.CaptureType = "Poll"
runninginstances[endpoint] = m
ri_mutex.Unlock()
PollMastodonPleroma(endpoint, reportPostChan) PollMastodonPleroma(endpoint, reportPostChan)
} else if nodeinfo.Software.Name == "mastodon" { } else if nodeinfo.Software.Name == "mastodon" {
log.Print("Starting " + endpoint + " as " + nodeinfo.Software.Name) log.Print("Starting " + endpoint + " as " + nodeinfo.Software.Name)
m.CaptureType = "Stream"
runninginstances[endpoint] = m
ri_mutex.Unlock()
StreamMastodon(endpoint, reportPostChan) StreamMastodon(endpoint, reportPostChan)
} }

15
engine/stream.go
View File

@ -14,9 +14,7 @@ import (
func StreamMastodon(endpoint string, reportPostChan chan ReportPost) { func StreamMastodon(endpoint string, reportPostChan chan ReportPost) {
http_client := http.Client{} http_client := http.Client{}
// use_auth := false
// var last_refresh int64
var client_id string var client_id string
var client_secret string var client_secret string
var oauthData OAuth var oauthData OAuth
@ -60,6 +58,13 @@ func StreamMastodon(endpoint string, reportPostChan chan ReportPost) {
} }
defer resp.Body.Close() defer resp.Body.Close()
ri_mutex.Lock()
m := runninginstances[endpoint]
m.Status = RUNNING
runninginstances[endpoint] = m
m.LastRun = "Streaming"
ri_mutex.Unlock()
s := bufio.NewScanner(resp.Body) s := bufio.NewScanner(resp.Body)
var name string var name string
for s.Scan() { for s.Scan() {
@ -144,4 +149,10 @@ func StreamMastodon(endpoint string, reportPostChan chan ReportPost) {
ri_mutex.Unlock() ri_mutex.Unlock()
} }
} }
ri_mutex.Lock()
m.Status = STREAM_ENDED
runninginstances[endpoint] = m
m.LastRun = time.Now().Format(time.RFC3339)
ri_mutex.Unlock()
} }