Skip to content

Commit

Permalink
core: fix 100% cpu when sub process fail to start
Browse files Browse the repository at this point in the history
  • Loading branch information
micooz committed Nov 24, 2018
1 parent dd5397a commit b0939ac
Show file tree
Hide file tree
Showing 8 changed files with 759 additions and 597 deletions.
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
# 更新日志

## 0.3.1 (2018-11-24)

### :bug: Bug 修复:

- 修复子进程(blinksocks)启动失败导致 CPU 占满的问题

### 从 0.3.0 更新到 0.3.1

```
$ npm install -g [email protected] [email protected]
```

## 0.3.0 (2018-05-14)

### :rocket: 新功能和改进
Expand Down
18 changes: 2 additions & 16 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,12 @@
[![license](https://img.shields.io/npm/l/blinksocks-gui.svg)](https://github.com/blinksocks/blinksocks-gui/blob/master/LICENSE)
[![%e2%9d%a4](https://img.shields.io/badge/made%20with-%e2%9d%a4-ff69b4.svg)](https://github.com/blinksocks/blinksocks-gui)

[blinksocks](https://github.com/blinksocks/blinksocks) 封装的 WEB 图形化界面。
> [blinksocks](https://github.com/blinksocks/blinksocks) 封装的 WEB 图形化界面。
![](screenshot-0.png)

![](screenshot-1.png)

![](screenshot-2.png)

## 在线体验(只读模式)

https://gui.blinksocks.org/landing?password=preview

## 特性

- 三大平台支持(Windows、Linux、macOS)
Expand All @@ -43,18 +37,10 @@ $ npm install -g blinksocks blinksocks-gui

需要升级时重新执行上面的命令即可。

### 使用预编译版本

> 使用预编译版本无需安装 Node.js 和其他依赖软件,但升级时必须重新下载、解压和替换整个软件包。
下载地址:https://github.com/blinksocks/blinksocks-gui/releases

## 启动

### 交互式启动

桌面环境双击直接运行,服务器环境从命令行启动:

```
$ NODE_ENV=production blinksocks-gui
```
Expand Down Expand Up @@ -86,7 +72,7 @@ info: You can now open blinksocks-gui in browser:
```

### 命令行启动
### 一行命令启动

```
$ blinksocks-gui --client --port 3000
Expand Down
Loading

0 comments on commit b0939ac

Please sign in to comment.