gfwleak/pxz-hos-client-cpp-module
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

添加debug文件

Browse Source
This commit is contained in:
彭宣正
2021-03-22 17:51:42 +08:00
parent aadc23cbfd
commit bf1b324890
3 changed files with 21852 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21733
.gitignore vendored
View File

File diff suppressed because it is too large Load Diff

205
.gitlab-ci.yml
View File

@@ -1,88 +1,117 @@
image: "git.mesalab.cn:7443/mesa_platform/build-env:master" image: "git.mesalab.cn:7443/mesa_platform/build-env:master"
variables: variables:
GIT_STRATEGY: "clone" GIT_STRATEGY: "clone"
BUILD_PADDING_PREFIX: /tmp/padding_for_CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX_PREFIX_PREFIX_PREFIX_PREFIX_PREFIX/ BUILD_PADDING_PREFIX: /tmp/padding_for_CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX_PREFIX_PREFIX_PREFIX_PREFIX_PREFIX/
INSTALL_PREFIX: "/home/mesasoft/sapp_run/" INSTALL_PREFIX: "/home/mesasoft/sapp_run/"
INSTALL_DEPENDENCY_LIBRARY: libMESA_handle_logger-devel libcjson-devel libMESA_field_stat2-devel sapp-devel framework_env libMESA_prof_load-devel http-devel dns-devel ftp-devel mail-devel ssl-devel librdkafka-devel libmaatframe-devel tsg_master-devel libdocumentanalyze-devel zlib-devel openssl-devel curl-devel libaws-c-common libaws-c-common-devel libaws-c-checksums libaws-c-checksums-devel libaws-c-event-stream libaws-c-event-stream-devel libaws-cpp-sdk-core libaws-cpp-sdk-core-devel libaws-cpp-sdk-s3 libaws-cpp-sdk-s3-devel INSTALL_DEPENDENCY_LIBRARY: libMESA_handle_logger-devel libcjson-devel libMESA_field_stat2-devel sapp-devel framework_env libMESA_prof_load-devel http-devel dns-devel ftp-devel mail-devel ssl-devel librdkafka-devel libmaatframe-devel tsg_master-devel libdocumentanalyze-devel zlib-devel openssl-devel curl-devel libaws-c-common libaws-c-common-devel libaws-c-checksums libaws-c-checksums-devel libaws-c-event-stream libaws-c-event-stream-devel libaws-cpp-sdk-core libaws-cpp-sdk-core-devel libaws-cpp-sdk-s3 libaws-cpp-sdk-s3-devel
TESTING_VERSION_BUILD: 0
stages:
- build stages:
- build
.build_by_travis:
before_script: .build_by_travis:
- mkdir -p $BUILD_PADDING_PREFIX/$CI_PROJECT_NAMESPACE/ before_script:
- ln -s $CI_PROJECT_DIR $BUILD_PADDING_PREFIX/$CI_PROJECT_PATH - mkdir -p $BUILD_PADDING_PREFIX/$CI_PROJECT_NAMESPACE/
- cd $BUILD_PADDING_PREFIX/$CI_PROJECT_PATH - ln -s $CI_PROJECT_DIR $BUILD_PADDING_PREFIX/$CI_PROJECT_PATH
- chmod +x ./ci/travis.sh - cd $BUILD_PADDING_PREFIX/$CI_PROJECT_PATH
script: - chmod +x ./ci/travis.sh
- yum makecache script:
- ./ci/travis.sh - yum makecache fast
- cd build - ./ci/travis.sh
tags: - cd build
- share tags:
- share
branch_build_debug:
stage: build branch_build_debug:
extends: .build_by_travis stage: build
variables: extends: .build_by_travis
BUILD_TYPE: Debug variables:
except: BUILD_TYPE: Debug
- /^develop.*$/i except:
- /^master.*$/i - /^develop.*$/i
- tags - /^master.*$/i
- tags
branch_build_release:
stage: build branch_build_release:
variables: stage: build
BUILD_TYPE: RelWithDebInfo variables:
extends: .build_by_travis BUILD_TYPE: RelWithDebInfo
except: extends: .build_by_travis
- /^develop.*$/i except:
- /^master.*$/i - /^develop.*$/i
- tags - /^master.*$/i
- tags
develop_build_debug:
stage: build develop_build_debug:
extends: .build_by_travis stage: build
variables: extends: .build_by_travis
BUILD_TYPE: Debug variables:
PACKAGE: 1 BUILD_TYPE: Debug
artifacts:
name: "hos-client-cpp-$CI_COMMIT_REF_NAME-debug" TESTING_VERSION_BUILD: 1
paths: PACKAGE: 1
- build/*.rpm UPLOAD: 1
only: PULP3_REPO_NAME: tsg-testing-x86_64.el7
- /^develop.*$/i PULP3_DIST_NAME: tsg-testing-x86_64.el7
- /^master.*$/i artifacts:
name: "hos-client-cpp-$CI_COMMIT_REF_NAME-debug"
develop_build_release: paths:
stage: build - build/*.rpm
extends: .build_by_travis only:
variables: - /^develop.*$/i
BUILD_TYPE: RelWithDebInfo - /^master.*$/i
PACKAGE: 1
artifacts: develop_build_release:
name: "hos-client-cpp-$CI_COMMIT_REF_NAME-release" stage: build
paths: extends: .build_by_travis
- build/*.rpm variables:
only: BUILD_TYPE: RelWithDebInfo
- /^develop.*$/i TESTING_VERSION_BUILD: 1
- /^master.*$/i PACKAGE: 1
UPLOAD: 1
ASAN_OPTION: "OFF"
release_build_release: PULP3_REPO_NAME: tsg-testing-x86_64.el7
stage: build PULP3_DIST_NAME: tsg-testing-x86_64.el7
variables: artifacts:
BUILD_TYPE: RelWithDebInfo name: "hos-client-cpp-$CI_COMMIT_REF_NAME-release"
PACKAGE: 1 paths:
UPLOAD: 1 - build/*.rpm
PULP3_REPO_NAME: framework-stable-x86_64.el7 only:
PULP3_DIST_NAME: framework-stable-x86_64.el7 - /^develop.*$/i
extends: .build_by_travis - /^master.*$/i
artifacts:
name: "hos-client-cpp-$CI_COMMIT_REF_NAME-release"
paths: release_build_release:
- build/*.rpm stage: build
only: variables:
- tags BUILD_TYPE: RelWithDebInfo
PACKAGE: 1
UPLOAD: 1
PULP3_REPO_NAME: framework-stable-x86_64.el7
PULP3_DIST_NAME: framework-stable-x86_64.el7
extends: .build_by_travis
artifacts:
name: "hos-client-cpp-$CI_COMMIT_REF_NAME-release"
paths:
- build/*.rpm
only:
- tags
release_build_release_devel:
stage: build
variables:
BUILD_TYPE: RelWithDebInfo
ENABLE_DEVEL_SWITCH: "ON"
PACKAGE: 1
UPLOAD: 1
UPLOAD_SYMBOL_FILES: 1
SYMBOL_TARGET: hos-client-cpp
PULP3_REPO_NAME: framework-stable-x86_64.el7
PULP3_DIST_NAME: framework-stable-x86_64.el7
extends: .build_by_travis
artifacts:
name: "hos-client-cpp-$CI_COMMIT_REF_NAME-release"
paths:
- build/*.rpm
only:
- tags

4
src/hos_client.cpp
View File

@@ -961,8 +961,6 @@ int hos_client_destory(hos_client_handle handle)
return HOS_CLIENT_OK; return HOS_CLIENT_OK;
} }
delete handle->S3Client;
Aws::Vector<Aws::S3::Model::Bucket>().swap(handle->buckets); Aws::Vector<Aws::S3::Model::Bucket>().swap(handle->buckets);
if (handle->fd_thread) if (handle->fd_thread)
@@ -1009,6 +1007,8 @@ int hos_client_destory(hos_client_handle handle)
} }
} }
delete handle->S3Client;
if (hos_cache) if (hos_cache)
{ {
free(hos_cache); free(hos_cache);