Skip to content

Commit

Permalink
improved logging
Browse files Browse the repository at this point in the history
  • Loading branch information
sshh12 committed Dec 18, 2020
1 parent e316174 commit 3f64a8f
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 6 deletions.
8 changes: 8 additions & 0 deletions cmd/android/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,26 @@ import (
func main() {
apollgo := app.NewApollgoApp("/sdcard/apollgo.json")
go apollgo.Run()
apollgo.Log("Apollgo started.")
go web.ServeWebApp(apollgo)
gliderlog.F = func(s string, v ...interface{}) { apollgo.Log(fmt.Sprintf(s, v...)) }
initCfg := apollgo.GetCfg()
if initCfg.EnableGlider {
apollgo.Log("Serving glider...")
if err := network.ServeGlider(initCfg.Listeners); err != nil {
apollgo.Log(err.Error())
}
} else {
apollgo.Log("Glider disabled by settings.")
}
if initCfg.EnableHermes {
apollgo.Log("Serving hermes...")
if err := network.ServeHermes(initCfg.HermesConfig, apollgo.Log); err != nil {
apollgo.Log(err.Error())
}
} else {
apollgo.Log("Hermes disabled by settings.")
}
apollgo.Log("Launching UI.")
mobileapp.Main(app.OnAppLaunch)
}
1 change: 1 addition & 0 deletions network/hermes.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ func ServeHermes(cfg HermesConfig, log func(string)) error {
return err
}
go func() {
log(fmt.Sprintf("Running hermes :%d -> %s:%d", appPort, cfg.Server, remotePort))
client, err := hermesTCP.NewClient(
appPort,
remotePort,
Expand Down
9 changes: 8 additions & 1 deletion react/src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ function App() {
let [tab, setTab] = useState(getTab());
let [status, setStatus] = useState(null);
let [config, setConfig] = useState(null);
let [defaults, setDefaults] = useState(null);
let [loading, setLoading] = useState(false);
let [lostConn, setLostConn] = useState(false);
useEffect(() => {
Expand All @@ -45,6 +46,7 @@ function App() {
});
}, 10 * 1000);
api.get('/api/config').then(setConfig);
api.get('/api/config/defaults').then(setDefaults);
}, []);
let applyConfig = (newCfg) => {
setLoading(true);
Expand Down Expand Up @@ -85,7 +87,12 @@ function App() {
</Link>
))}
</Flex>
<TabView status={status} config={config} setConfig={applyConfig} />
<TabView
status={status}
config={config}
setConfig={applyConfig}
defaults={defaults}
/>
</div>
</ThemeProvider>
);
Expand Down
4 changes: 2 additions & 2 deletions react/src/components/Glider.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { Label, Select, Checkbox, Switch } from '@rebass/forms';
import TextInput from './TextInput';
import CSVInput from './CSVInput';

export default function Glider({ config, setConfig }) {
export default function Glider({ config, setConfig, defaults }) {
let [editCfg, setEditCfg] = useState(config);
useEffect(() => {
setEditCfg(config);
Expand All @@ -16,7 +16,7 @@ export default function Glider({ config, setConfig }) {
};
let addListener = () => {
let newCfg = JSON.parse(JSON.stringify(editCfg));
newCfg.listeners = newCfg.listeners.concat([newCfg.listeners[0]]);
newCfg.listeners = newCfg.listeners.concat([defaults.listeners[0]]);
setEditCfg(newCfg);
};
let deleteListener = (idx) => {
Expand Down
4 changes: 2 additions & 2 deletions react/src/components/Hermes.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, { useState, useEffect } from 'react';
import { Box, Card, Heading, Flex, Button, Text } from 'rebass';
import { Label, Input, Select, Checkbox, Switch } from '@rebass/forms';
import { Box, Flex, Button } from 'rebass';
import { Switch } from '@rebass/forms';
import TextInput from './TextInput';
import CSVInput from './CSVInput';

Expand Down
5 changes: 4 additions & 1 deletion web/web.go
Original file line number Diff line number Diff line change
Expand Up @@ -87,12 +87,15 @@ func ServeWebApp(apollgo *app.ApollgoApp) {
})
router.PathPrefix("/").Handler(SpaHandler{})

addr := fmt.Sprintf("0.0.0.0:%d", initCfg.ApollgoPort)
srv := &http.Server{
Handler: router,
Addr: fmt.Sprintf("0.0.0.0:%d", initCfg.ApollgoPort),
Addr: addr,
WriteTimeout: 15 * time.Second,
ReadTimeout: 15 * time.Second,
}

apollgo.Log("Web server starting on " + addr)

srv.ListenAndServe()
}

0 comments on commit 3f64a8f

Please sign in to comment.