gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'keydbpro' into upgrade_rocksdb

Browse Source 
Former-commit-id: 1bf9d7e749e7007f1309f3e57e366122fdbacbac
This commit is contained in:
malavan 2021-08-24 21:54:01 +00:00
commit 1046b46171
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitlab-ci.yml
View File

@ -12,7 +12,7 @@ build:
- docker - docker
stage: build stage: build
script: script:
- git submodule init && git submodule update - git submodule update --init --remote
- make distclean - make distclean
- make -j - make -j
artifacts: artifacts:
@ -113,7 +113,7 @@ endurance-test:
- docker - docker
stage: test stage: test
script: script:
- git submodule init && git submodule update - git submodule update --init --remote
- make distclean - make distclean
- make -j - make -j
- ./runtest --config server-threads 3 --loop --stop - ./runtest --config server-threads 3 --loop --stop
@ -125,7 +125,7 @@ coverage-test:
- docker - docker
stage: test stage: test
script: script:
- git submodule init && git submodule update - git submodule update --init --remote
- make distclean - make distclean
- make gcov -j - make gcov -j
- make install - make install

4
pkg/deb/conf/keydb.conf
View File

@ -261,7 +261,7 @@ tcp-keepalive 300
# By default KeyDB does not run as a daemon. Use 'yes' if you need it. # By default KeyDB does not run as a daemon. Use 'yes' if you need it.
# Note that KeyDB will write a pid file in /var/run/keydb.pid when daemonized. # Note that KeyDB will write a pid file in /var/run/keydb.pid when daemonized.
daemonize no daemonize yes
# If you run KeyDB from upstart or systemd, KeyDB can interact with your # If you run KeyDB from upstart or systemd, KeyDB can interact with your
# supervision tree. Options: # supervision tree. Options:
@ -284,7 +284,7 @@ daemonize no
# #
# Creating a pid file is best effort: if KeyDB is not able to create it # Creating a pid file is best effort: if KeyDB is not able to create it
# nothing bad happens, the server will start and run normally. # nothing bad happens, the server will start and run normally.
pidfile /var/run/keydb_6379.pid pidfile /var/run/keydb/keydb-server.pid
# Specify the server verbosity level. # Specify the server verbosity level.
# This can be one of: # This can be one of: