diff options
| author | Nate Sesti <sestinj@gmail.com> | 2023-09-16 22:08:23 -0700 | 
|---|---|---|
| committer | Nate Sesti <sestinj@gmail.com> | 2023-09-16 22:08:23 -0700 | 
| commit | 6a8c48f72c697865d8889fe528aba1ad930011b5 (patch) | |
| tree | d28d3fd8cc994452447ef19d23e5167ffc2c12c5 /continuedev/src/continuedev/server | |
| parent | 874e63c89d45e14253925e9e85dda12bac629829 (diff) | |
| parent | 7a86f6a41b16d94f676bf327d35fb768854becb4 (diff) | |
| download | sncontinue-6a8c48f72c697865d8889fe528aba1ad930011b5.tar.gz sncontinue-6a8c48f72c697865d8889fe528aba1ad930011b5.tar.bz2 sncontinue-6a8c48f72c697865d8889fe528aba1ad930011b5.zip | |
Merge branch 'main' of https://github.com/continuedev/continue
Diffstat (limited to 'continuedev/src/continuedev/server')
| -rw-r--r-- | continuedev/src/continuedev/server/meilisearch_server.py | 19 | 
1 files changed, 13 insertions, 6 deletions
| diff --git a/continuedev/src/continuedev/server/meilisearch_server.py b/continuedev/src/continuedev/server/meilisearch_server.py index f3734470..40d46b18 100644 --- a/continuedev/src/continuedev/server/meilisearch_server.py +++ b/continuedev/src/continuedev/server/meilisearch_server.py @@ -77,14 +77,13 @@ async def ensure_meilisearch_installed() -> bool:              except:                  pass              existing_paths.remove(meilisearchPath) -             +              await download_meilisearch()          # Clear the existing directories          for p in existing_paths:              shutil.rmtree(p, ignore_errors=True) -          return False      return True @@ -160,17 +159,25 @@ def stop_meilisearch():  import psutil +  def kill_proc(port):      for proc in psutil.process_iter():          try: -            for conns in proc.connections(kind='inet'): +            for conns in proc.connections(kind="inet"):                  if conns.laddr.port == port: -                    proc.send_signal(psutil.signal.SIGTERM) # or SIGKILL +                    proc.send_signal(psutil.signal.SIGTERM)  # or SIGKILL          except psutil.AccessDenied: -            logger.warning(f"Failed to kill process on port {port}") +            logger.warning(f"Failed to kill process on port {port} (access denied)") +            return +        except psutil.ZombieProcess: +            logger.warning(f"Failed to kill process on port {port} (zombie process)") +            return +        except psutil.NoSuchProcess: +            logger.warning(f"Failed to kill process on port {port} (no such process)") +            return  async def restart_meilisearch():      stop_meilisearch()      kill_proc(7700) -    await start_meilisearch()
\ No newline at end of file +    await start_meilisearch() | 
