lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2026-06-06 02:59:27 -04:00
Code Issues Releases Wiki Activity

move common/log to app/log

Browse Source
This commit is contained in:
Darien Raymond
2017-02-01 21:35:40 +01:00
parent 57fc444b3c
commit f046f334cd
59 changed files with 290 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
config.proto
View File

@@ -8,7 +8,6 @@ option java_outer_classname = "ConfigProto";
import "v2ray.com/core/app/proxyman/config.proto";
import "v2ray.com/core/common/serial/typed_message.proto";
import "v2ray.com/core/common/log/config.proto";
import "v2ray.com/core/transport/config.proto";
// Configuration serialization format.
@@ -24,7 +23,7 @@ message Config {
// Outbound handler configurations. Must have at least one item. The first item is used as default for routing.
repeated v2ray.core.app.proxyman.OutboundHandlerConfig outbound = 2;
v2ray.core.common.log.Config log = 3;
reserved 3;
// App configuration. Must be one in the app directory.
repeated v2ray.core.common.serial.TypedMessage app = 4;