Skip to content
Snippets Groups Projects
Verified Commit 13e8cc09 authored by Denis Smirnov's avatar Denis Smirnov
Browse files

refactoring: move fiber_id() from cartridge to core

parent 651d4558
No related branches found
No related tags found
1 merge request!1414sbroad import
......@@ -11,6 +11,7 @@ endif
TARGET_ROOT?=../target
CARTRIDGE_MODULE?=.
CORE_MODULE=$(CARTRIDGE_MODULE)/../sbroad-core
TEST_APP=$(CARTRIDGE_MODULE)/test_app
build_cartridge_engine:
......@@ -27,14 +28,16 @@ run_integration:
install_debug:
mkdir -p $(LUADIR)/$(PROJECT_NAME)
cp -Rf ../target/debug/$(SRC_LIB) $(LIBDIR)/$(DEST_LIB)
cp -Rf src/*.lua $(LUADIR)/$(PROJECT_NAME)
cp -Rf cartridge $(LUADIR)
cp -Rf $(TARGET_ROOT)/debug/$(SRC_LIB) $(LIBDIR)/$(DEST_LIB)
cp -Rf $(CARTRIDGE_MODULE)/src/*.lua $(LUADIR)/$(PROJECT_NAME)
cp -Rf $(CORE_MODULE)/src/*.lua $(LUADIR)/$(PROJECT_NAME)
cp -Rf $(CARTRIDGE_MODULE)/cartridge $(LUADIR)
install_release:
mkdir -p $(LUADIR)/$(PROJECT_NAME)
cp -Rf $(TARGET_ROOT)/release/$(SRC_LIB) $(LIBDIR)/$(DEST_LIB)
cp -Rf $(CARTRIDGE_MODULE)/src/*.lua $(LUADIR)/$(PROJECT_NAME)
cp -Rf $(CORE_MODULE)/src/*.lua $(LUADIR)/$(PROJECT_NAME)
cp -Rf $(CARTRIDGE_MODULE)/cartridge $(LUADIR)
test_integration:
......
require 'sbroad.core'
local cartridge = require('cartridge')
_G.fiber_id = function ()
local fiber = require('fiber')
return fiber.id()
end
_G.get_jaeger_agent_host = function()
local cfg = cartridge.config_get_readonly()
......
_G.fiber_id = function ()
local fiber = require('fiber')
return fiber.id()
end
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment