mirror of
http://git.haproxy.org/git/haproxy.git/
synced 2024-12-16 08:24:42 +00:00
3e235d38ec
Background:
Python 2 is no longer supported since January, 1st 2020 as per
https://www.python.org/doc/sunset-python-2/
The purpose of this change is to make the spoa_server contrib library
compatible with Python 3 to allow transition to Python 3.
Test Settings:
ps_python.py:
...
spoa.set_var_null("null", spoa.scope_txn)
spoa.set_var_boolean("boolean", spoa.scope_txn, True)
spoa.set_var_int32("int32", spoa.scope_txn, 1234)
spoa.set_var_uint32("uint32", spoa.scope_txn, 1234)
spoa.set_var_int64("int64", spoa.scope_txn, 1234)
spoa.set_var_uint64("uint64", spoa.scope_txn, 1234)
spoa.set_var_ipv4("ipv4", spoa.scope_txn, ipaddress.IPv4Address(u"127.0.0.1"))
spoa.set_var_ipv6("ipv6", spoa.scope_txn, ipaddress.IPv6Address(u"1::f"))
spoa.set_var_str("str", spoa.scope_txn, "1::f")
spoa.set_var_bin("bin", spoa.scope_txn, "1:\x01:\x42f\x63\x63")
spoa.set_var_str("python_version", spoa.scope_sess, str(sys.version_info))
...
haproxy.cfg:
...
http-request capture var(txn.verb.null),debug len 1
http-request capture var(txn.verb.boolean),debug len 1
http-request capture var(txn.verb.int32),debug len 4
http-request capture var(txn.verb.uint32),debug len 4
http-request capture var(txn.verb.int64),debug len 4
http-request capture var(txn.verb.uint64),debug len 4
http-request capture var(txn.verb.ipv4),debug len 16
http-request capture var(txn.verb.ipv6),debug len 45
http-request capture var(txn.verb.str),debug len 32
http-request capture var(txn.verb.bin),debug len 32
http-request capture var(sess.verb.python_version),debug len 100
...
Test result:
Python 3.8:
ft_public ft_public/<NOSRV> 0/-1/-1/-1/0 403 212 - - PR-- 1/1/0/0/0 0/0 {|1|1234|1234|1234|1234|127.0.0.1|1::f|1::f|1:#01:Bfcc|sys.version_info(major=3, minor=8, micro=1, releaselevel='final', serial=0)} "POST / HTTP/1.1"
Python 3.7:
ft_public ft_public/<NOSRV> 0/-1/-1/-1/0 403 212 - - PR-- 1/1/0/0/0 0/0 {|1|1234|1234|1234|1234|127.0.0.1|1::f|1::f|1:#01:Bfcc|sys.version_info(major=3, minor=7, micro=6, releaselevel='final', serial=0)} "POST / HTTP/1.1"
Python 3.6:
ft_public ft_public/<NOSRV> 0/-1/-1/-1/0 403 212 - - PR-- 1/1/0/0/0 0/0 {|1|1234|1234|1234|1234|127.0.0.1|1::f|1::f|1:#01:Bfcc|sys.version_info(major=3, minor=6, micro=10, releaselevel='final', serial=0)} "POST / HTTP/1.1"
Python 2.7:
ft_public ft_public/<NOSRV> 0/-1/-1/-1/0 403 212 - - PR-- 1/1/0/0/0 0/0 {|1|1234|1234|1234|1234|127.0.0.1|1::f|1::f|1:#01:Bfcc|sys.version_info(major=2, minor=7, micro=17, releaselevel='final', serial=0)} "POST / HTTP/1.1"
Not tested:
Python <2.7
78 lines
1.7 KiB
Makefile
78 lines
1.7 KiB
Makefile
DESTDIR =
|
|
PREFIX = /usr/local
|
|
BINDIR = $(PREFIX)/bin
|
|
|
|
CC = gcc
|
|
LD = $(CC)
|
|
|
|
CFLAGS = -g -O2 -Wall -Werror -pthread
|
|
LDFLAGS = -lpthread
|
|
|
|
OBJS = spoa.o
|
|
|
|
ifneq ($(USE_LUA),)
|
|
OBJS += ps_lua.o
|
|
ifneq ($(LUA_INC),)
|
|
CFLAGS += -I$(LUA_INC)
|
|
endif
|
|
ifneq ($(LUA_LIB),)
|
|
LDLIBS += -L$(LUA_LIB)
|
|
endif
|
|
LDLIBS += -ldl -Wl,--export-dynamic -llua -lm -Wl,--no-export-dynamic
|
|
endif
|
|
|
|
ifneq ($(USE_PYTHON),)
|
|
OBJS += ps_python.o
|
|
|
|
# "--embed" flag is supported (and required) only from python 3.8+
|
|
check_python_config := $(shell if python3-config --embed; then echo "python3.8+"; \
|
|
elif hash python3-config; then echo "python3"; \
|
|
elif hash python-config; then echo "python2"; fi)
|
|
|
|
ifeq ($(check_python_config), python3.8+)
|
|
PYTHON_DEFAULT_INC := $(shell python3-config --includes)
|
|
PYTHON_DEFAULT_LIB := $(shell python3-config --libs --embed)
|
|
else ifeq ($(check_python_config), python3)
|
|
PYTHON_DEFAULT_INC := $(shell python3-config --includes)
|
|
PYTHON_DEFAULT_LIB := $(shell python3-config --libs)
|
|
else ifeq ($(check_python_config), python2)
|
|
PYTHON_DEFAULT_INC := $(shell python-config --includes)
|
|
PYTHON_DEFAULT_LIB := $(shell python-config --libs)
|
|
endif
|
|
|
|
|
|
# Add default path
|
|
ifneq ($(PYTHON_DEFAULT_INC),)
|
|
CFLAGS += $(PYTHON_DEFAULT_INC)
|
|
else
|
|
CFLAGS += -I/usr/include/python2.7
|
|
endif
|
|
ifneq ($(PYTHON_DEFAULT_LIB),)
|
|
LDLIBS += $(PYTHON_DEFAULT_LIB)
|
|
else
|
|
LDLIBS += -lpython2.7
|
|
endif
|
|
|
|
# Add user additional paths if any
|
|
ifneq ($(PYTHON_INC),)
|
|
CFLAGS += -I$(PYTHON_INC)
|
|
endif
|
|
ifneq ($(PYTHON_LIB),)
|
|
LDLIBS += -L$(PYTHON_LIB)
|
|
endif
|
|
|
|
LDLIBS +=-Wl,--export-dynamic
|
|
endif
|
|
|
|
spoa: $(OBJS)
|
|
$(LD) $(LDFLAGS) -o $@ $^ $(LDLIBS)
|
|
|
|
install: spoa
|
|
install spoa $(DESTDIR)$(BINDIR)
|
|
|
|
clean:
|
|
rm -f spoa $(OBJS)
|
|
|
|
%.o: %.c
|
|
$(CC) $(CFLAGS) -c -o $@ $<
|