From a8dd87ae1135f716150a3ee24d2664805e6494de Mon Sep 17 00:00:00 2001 From: medcl Date: Sun, 16 Jan 2022 14:59:11 +0800 Subject: [PATCH] update license and jenkinsfile --- Jenkinsfile | 1 + LICENSE | 16 ++++++++-------- main.go | 3 ++- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 1dc15bfb..cbdec133 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,6 +17,7 @@ pipeline { steps { catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE'){ sh 'cd /home/jenkins/go/src/infini.sh/search-center && git stash && git pull origin master && make clean' + sh 'cd /home/jenkins/go/src/infini.sh/search-center/ && rm -rif web' sh 'cd /home/jenkins/go/src/infini.sh/search-center/ && git clone ssh://git@git.infini.ltd:64221/infini/console-ui.git web' sh 'cd /home/jenkins/go/src/infini.sh/search-center/web && cnpm install' sh 'cd /home/jenkins/go/src/infini.sh/search-center && cnpm install' diff --git a/LICENSE b/LICENSE index b87ec1b9..6c2438e9 100644 --- a/LICENSE +++ b/LICENSE @@ -1,8 +1,8 @@ End-User License Agreement (EULA) of INFINI SOFTWARE -This End-User License Agreement ("EULA") is a legal agreement between you and HUNAN INFINI TECHNOLOGY CO,LTD +This End-User License Agreement ("EULA") is a legal agreement between you and INFINI LIMITED -This EULA agreement governs your acquisition and use of our INFINI software ("Software") directly from HUNAN INFINI TECHNOLOGY CO,LTD or indirectly through a HUNAN INFINI TECHNOLOGY CO,LTD authorized reseller or distributor (a "Reseller"). +This EULA agreement governs your acquisition and use of our INFINI software ("Software") directly from INFINI LIMITED or indirectly through a INFINI LIMITED authorized reseller or distributor (a "Reseller"). Please read this EULA agreement carefully before completing the installation process and using the INFINI software. It provides a license to use the INFINI software and contains warranty information and liability disclaimers. @@ -10,10 +10,10 @@ If you register for a free trial of the INFINI software, this EULA agreement wil If you are entering into this EULA agreement on behalf of a company or other legal entity, you represent that you have the authority to bind such entity and its affiliates to these terms and conditions. If you do not have such authority or if you do not agree with the terms and conditions of this EULA agreement, do not install or use the Software, and you must not accept this EULA agreement. -This EULA agreement shall apply only to the Software supplied by HUNAN INFINI TECHNOLOGY CO,LTD herewith regardless of whether other software is referred to or described herein. The terms also apply to any HUNAN INFINI TECHNOLOGY CO,LTD updates, supplements, Internet-based services, and support services for the Software, unless other terms accompany those items on delivery. If so, those terms apply. +This EULA agreement shall apply only to the Software supplied by INFINI LIMITED herewith regardless of whether other software is referred to or described herein. The terms also apply to any INFINI LIMITED updates, supplements, Internet-based services, and support services for the Software, unless other terms accompany those items on delivery. If so, those terms apply. License Grant -HUNAN INFINI TECHNOLOGY CO,LTD hereby grants you a personal, non-transferable, non-exclusive licence to use the INFINI software on your devices in accordance with the terms of this EULA agreement. +INFINI LIMITED hereby grants you a personal, non-transferable, non-exclusive licence to use the INFINI software on your devices in accordance with the terms of this EULA agreement. You are permitted to load the INFINI software (for example a PC, laptop, mobile or tablet) under your control. You are responsible for ensuring your device meets the minimum requirements of the INFINI software. @@ -23,14 +23,14 @@ Edit, alter, modify, adapt, translate or otherwise change the whole or any part Reproduce, copy, distribute, resell or otherwise use the Software for any commercial purpose Allow any third party to use the Software on behalf of or for the benefit of any third party Use the Software in any way which breaches any applicable local, national or international law -use the Software for any purpose that HUNAN INFINI TECHNOLOGY CO,LTD considers is a breach of this EULA agreement +use the Software for any purpose that INFINI LIMITED considers is a breach of this EULA agreement Intellectual Property and Ownership -HUNAN INFINI TECHNOLOGY CO,LTD shall at all times retain ownership of the Software as originally downloaded by you and all subsequent downloads of the Software by you. The Software (and the copyright, and other intellectual property rights of whatever nature in the Software, including any modifications made thereto) are and shall remain the property of HUNAN INFINI TECHNOLOGY CO,LTD. +INFINI LIMITED shall at all times retain ownership of the Software as originally downloaded by you and all subsequent downloads of the Software by you. The Software (and the copyright, and other intellectual property rights of whatever nature in the Software, including any modifications made thereto) are and shall remain the property of INFINI LIMITED. -HUNAN INFINI TECHNOLOGY CO,LTD reserves the right to grant licences to use the Software to third parties. +INFINI LIMITED reserves the right to grant licences to use the Software to third parties. Termination -This EULA agreement is effective from the date you first use the Software and shall continue until terminated. You may terminate it at any time upon written notice to HUNAN INFINI TECHNOLOGY CO,LTD. +This EULA agreement is effective from the date you first use the Software and shall continue until terminated. You may terminate it at any time upon written notice to INFINI LIMITED. It will also terminate immediately if you fail to comply with any term of this EULA agreement. Upon such termination, the licenses granted by this EULA agreement will immediately terminate and you agree to stop all access and use of the Software. The provisions that by their nature continue and survive will survive any termination of this EULA agreement. diff --git a/main.go b/main.go index ef4df843..7059a856 100644 --- a/main.go +++ b/main.go @@ -14,6 +14,7 @@ import ( "infini.sh/framework/modules/metrics" "infini.sh/framework/modules/pipeline" "infini.sh/framework/modules/queue" + queue2 "infini.sh/framework/modules/queue/disk_queue" "infini.sh/framework/modules/stats" "infini.sh/framework/modules/task" "infini.sh/framework/modules/ui" @@ -49,7 +50,7 @@ func main() { module.RegisterSystemModule(elastic2.ElasticModule{}) module.RegisterSystemModule(&filter.FilterModule{}) module.RegisterSystemModule(&stats.SimpleStatsModule{}) - module.RegisterSystemModule(&queue.DiskQueue{}) + module.RegisterSystemModule(&queue2.DiskQueue{}) module.RegisterSystemModule(&queue.RedisModule{}) module.RegisterSystemModule(&queue.QueueModule{}) module.RegisterSystemModule(&ui.UIModule{})