1
0
mirror of https://github.com/v2fly/v2ray-core.git synced 2025-01-03 16:07:16 -05:00
Commit Graph

16 Commits

Author SHA1 Message Date
Jebbs
9367e9b1f2
V5: YAML support (#475)
* yml support

* code optimize

* remove external conf loaders

* update yaml test
code optimize

* code optimize

* fix a typo

* update convert desc
2020-12-03 06:11:24 +08:00
Jebbs
ff59bd37ce
v5: New multi-json loader (#451)
* scalable commands column

* new multi-json loader
For both internal & external json loader

This commit also:
* applies -confdir to other formats, e.g. "yaml" in the future
* multiple assign of -confdir is accepted
* add flag to load confdir recursively
* config loader can have alias name
* json loader also accepts .jsonc
* add merge command
* add help topics for json merge, format loader
* format loaders don't panic

* apply lint style

* add merge test

* merge same tag in array, solve v2fly/discussion#97

* apply lint style

* merge code optimize

* fix merge cmdarg.Arg

* update cmd description

* improve merge logic
* fix zero value overwrite
* fix "null" lost after array merge

* code optimize

* fix merged slices not sorted

* code optimize

* add package doc

* fix a typo
2020-11-28 22:06:03 +08:00
Shelikhoo
9391f7c377
Apply Coding Style 2020-10-23 19:51:39 +01:00
Shelikhoo
fd2638c522
Fix json parsing dependency introduced by mutijson config 2020-10-23 15:04:03 +01:00
loyalsoldier
b181045b0c
Errorgen: support to run outside of GOPATH 2020-10-04 13:06:12 +08:00
vcptr
0d71d3dcf8 revert back to multiconfig 2020-03-19 19:11:16 +08:00
Kslr
fdbec9a141
Revert "multiple config" 2020-01-02 01:23:56 +08:00
vcptr
f14eb97e3c rearrange loader 2019-12-16 10:22:17 +08:00
vcptr
75f0879c12 proper handle stdin 2019-12-14 23:48:56 +08:00
vcptr
1bb34bfe17 abstract type for conf load func 2019-12-14 23:48:56 +08:00
vcptr
1e76123a4c main loads multiple 2019-12-14 23:48:56 +08:00
Darien Raymond
842a089dad
refactor multibuffer 2018-11-18 19:36:36 +01:00
Darien Raymond
091fa6ad23
use new errorgen 2018-09-30 23:08:41 +02:00
Darien Raymond
d55fbd7f8d
simplify error creation 2018-09-30 18:39:53 +02:00
Darien Raymond
b7f2f30244
support fetching config from http 2018-04-08 23:22:55 +02:00
Darien Raymond
ab9ca3b842
move json config into a separate package 2018-02-17 21:22:51 +01:00