gered/ollama
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #164 from jmorganca/restart-server

Browse source 
restart server more gracefully
This commit is contained in:
hoyyeva 2023-07-22 18:19:22 -04:00 committed by GitHub
parent efacd45fc5 9657314ae2
commit c448443813
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/package.json
View file

@ -11,7 +11,9 @@
"make": "electron-forge make", "make": "electron-forge make",
"make:sign": "SIGN=1 electron-forge make", "make:sign": "SIGN=1 electron-forge make",
"publish": "SIGN=1 electron-forge publish", "publish": "SIGN=1 electron-forge publish",
"lint": "eslint --ext .ts,.tsx ." "lint": "eslint --ext .ts,.tsx .",
"format": "prettier --check . --ignore-path .gitignore",
"format:fix": "prettier --write . --ignore-path .gitignore"
}, },
"keywords": [], "keywords": [],
"author": { "author": {

4
app/src/declarations.d.ts vendored
View file

@ -1,4 +1,4 @@
declare module '*.svg' { declare module '*.svg' {
const content: string; const content: string
export default content; export default content
} }

9
app/src/index.ts
View file

@ -72,13 +72,13 @@ function createSystemtray() {
if (app.isPackaged) { if (app.isPackaged) {
iconPath = nativeTheme.shouldUseDarkColors iconPath = nativeTheme.shouldUseDarkColors
? path.join(process.resourcesPath, 'ollama_icon_16x16Template.png') ? path.join(process.resourcesPath, 'ollama_icon_16x16Template.png')
: path.join(process.resourcesPath, 'ollama_outline_icon_16x16Template.png') : path.join(process.resourcesPath, 'ollama_outline_icon_16x16Template.png')
} }
tray = new Tray(iconPath) tray = new Tray(iconPath)
nativeTheme.on('updated', function theThemeHasChanged () { nativeTheme.on('updated', function theThemeHasChanged() {
if (nativeTheme.shouldUseDarkColors) { if (nativeTheme.shouldUseDarkColors) {
app.isPackaged app.isPackaged
? tray.setImage(path.join(process.resourcesPath, 'ollama_icon_16x16Template.png')) ? tray.setImage(path.join(process.resourcesPath, 'ollama_icon_16x16Template.png'))
@ -116,8 +116,7 @@ function server() {
}) })
function restart() { function restart() {
logger.info('Restarting the server...') setTimeout(server, 3000)
server()
} }
proc.on('exit', restart) proc.on('exit', restart)