Gaze/SpaceVim
1
0
Fork 0
mirror of https://github.com/SpaceVim/SpaceVim.git synced 2025-03-23 17:49:57 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #979 from SpaceVim/server

Browse Source 
Fix server error
This commit is contained in:
Wang Shidong 2017-11-09 07:32:18 -06:00 committed by GitHub
commit d71153ae55
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.travis.yml
View File

@ -8,14 +8,6 @@ notifications:
email: email:
on_success: never # default: change on_success: never # default: change
on_failure: never # default: always on_failure: never # default: always
irc:
on_success: change # default: change
on_failure: never # default: always
channels:
- "chat.freenode.net#spacevim"
template:
- "%{repository} (%{commit}) : %{message} %{foo} "
- "Build details: %{build_url}"
cache: cache:
pip: true pip: true

10
autoload/SpaceVim/server.vim
View File

@ -8,8 +8,11 @@
" This function should not be called twice!
let s:flag = 0
function! SpaceVim#server#connect() function! SpaceVim#server#connect()
if s:flag == 0
if empty($SPACEVIM_SERVER_ADDRESS) if empty($SPACEVIM_SERVER_ADDRESS)
let $SPACEVIM_SERVER_ADDRESS = fnamemodify('/tmp/' . (has('nvim') ? 'spacevim_nvim_' : 'spacevim_vim_') . 'server', ':p') let $SPACEVIM_SERVER_ADDRESS = fnamemodify('/tmp/' . (has('nvim') ? 'spacevim_nvim_' : 'spacevim_vim_') . 'server', ':p')
endif endif
@ -19,12 +22,17 @@ function! SpaceVim#server#connect()
call SpaceVim#logger#info('SpaceVim server startup at:' . $SPACEVIM_SERVER_ADDRESS) call SpaceVim#logger#info('SpaceVim server startup at:' . $SPACEVIM_SERVER_ADDRESS)
catch /Failed to start server: address already in use/ catch /Failed to start server: address already in use/
endtry endtry
elseif exists('*remote_startserver') elseif has('clientserver') && exists('*remote_startserver')
if index(split(serverlist(), "\n"), $SPACEVIM_SERVER_ADDRESS) == -1 if index(split(serverlist(), "\n"), $SPACEVIM_SERVER_ADDRESS) == -1
try
call remote_startserver($SPACEVIM_SERVER_ADDRESS) call remote_startserver($SPACEVIM_SERVER_ADDRESS)
call SpaceVim#logger#info('SpaceVim server startup at:' . $SPACEVIM_SERVER_ADDRESS) call SpaceVim#logger#info('SpaceVim server startup at:' . $SPACEVIM_SERVER_ADDRESS)
catch
endtry
endif endif
endif endif
let s:flag = 1
endif
endfunction endfunction