Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
zhaominxu
Open-IM-Server
提交
72b09864
O
Open-IM-Server
项目概览
zhaominxu
/
Open-IM-Server
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
Open-IM-Server
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
72b09864
编写于
11月 26, 2021
作者:
programor_guo
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
panic output detail info
上级
b1244c0a
变更
8
显示空白变更内容
内联
并排
Showing
8 changed file
with
25 addition
and
25 deletion
+25
-25
pkg/common/config/config.go
pkg/common/config/config.go
+2
-2
pkg/common/db/model.go
pkg/common/db/model.go
+2
-2
pkg/common/db/mysql.go
pkg/common/db/mysql.go
+12
-12
pkg/common/kafka/consumer.go
pkg/common/kafka/consumer.go
+2
-2
pkg/common/kafka/consumer_group.go
pkg/common/kafka/consumer_group.go
+3
-3
pkg/common/kafka/producer.go
pkg/common/kafka/producer.go
+1
-1
pkg/common/log/logrus.go
pkg/common/log/logrus.go
+2
-2
pkg/utils/get_server_ip.go
pkg/utils/get_server_ip.go
+1
-1
未找到文件。
pkg/common/config/config.go
浏览文件 @
72b09864
...
@@ -164,10 +164,10 @@ func init() {
...
@@ -164,10 +164,10 @@ func init() {
// it will panic cannot find config/config.yaml
// it will panic cannot find config/config.yaml
bytes
,
err
:=
ioutil
.
ReadFile
(
Root
+
"/config/config.yaml"
)
bytes
,
err
:=
ioutil
.
ReadFile
(
Root
+
"/config/config.yaml"
)
if
err
!=
nil
{
if
err
!=
nil
{
panic
(
err
)
panic
(
err
.
Error
()
)
}
}
if
err
=
yaml
.
Unmarshal
(
bytes
,
&
Config
);
err
!=
nil
{
if
err
=
yaml
.
Unmarshal
(
bytes
,
&
Config
);
err
!=
nil
{
panic
(
err
)
panic
(
err
.
Error
()
)
}
}
}
}
pkg/common/db/model.go
浏览文件 @
72b09864
...
@@ -35,14 +35,14 @@ func init() {
...
@@ -35,14 +35,14 @@ func init() {
}
}
mgoSession
,
err
:=
mgo
.
DialWithInfo
(
mgoDailInfo
)
mgoSession
,
err
:=
mgo
.
DialWithInfo
(
mgoDailInfo
)
if
err
!=
nil
{
if
err
!=
nil
{
panic
(
err
)
panic
(
err
.
Error
()
)
}
}
DB
.
mgoSession
=
mgoSession
DB
.
mgoSession
=
mgoSession
DB
.
mgoSession
.
SetMode
(
mgo
.
Monotonic
,
true
)
DB
.
mgoSession
.
SetMode
(
mgo
.
Monotonic
,
true
)
c
:=
DB
.
mgoSession
.
DB
(
config
.
Config
.
Mongo
.
DBDatabase
)
.
C
(
cChat
)
c
:=
DB
.
mgoSession
.
DB
(
config
.
Config
.
Mongo
.
DBDatabase
)
.
C
(
cChat
)
err
=
c
.
EnsureIndexKey
(
"uid"
)
err
=
c
.
EnsureIndexKey
(
"uid"
)
if
err
!=
nil
{
if
err
!=
nil
{
panic
(
err
)
panic
(
err
.
Error
()
)
}
}
// redis pool init
// redis pool init
...
...
pkg/common/db/mysql.go
浏览文件 @
72b09864
...
@@ -23,14 +23,14 @@ func initMysqlDB() {
...
@@ -23,14 +23,14 @@ func initMysqlDB() {
db
,
err
:=
gorm
.
Open
(
"mysql"
,
dsn
)
db
,
err
:=
gorm
.
Open
(
"mysql"
,
dsn
)
if
err
!=
nil
{
if
err
!=
nil
{
log
.
Error
(
""
,
""
,
dsn
)
log
.
Error
(
""
,
""
,
dsn
)
panic
(
err
)
panic
(
err
.
Error
()
)
}
}
//Check the database and table during initialization
//Check the database and table during initialization
sql
:=
fmt
.
Sprintf
(
"CREATE DATABASE IF NOT EXISTS %s ;"
,
config
.
Config
.
Mysql
.
DBDatabaseName
)
sql
:=
fmt
.
Sprintf
(
"CREATE DATABASE IF NOT EXISTS %s ;"
,
config
.
Config
.
Mysql
.
DBDatabaseName
)
err
=
db
.
Exec
(
sql
)
.
Error
err
=
db
.
Exec
(
sql
)
.
Error
if
err
!=
nil
{
if
err
!=
nil
{
panic
(
err
)
panic
(
err
.
Error
()
)
}
}
db
.
Close
()
db
.
Close
()
...
@@ -38,7 +38,7 @@ func initMysqlDB() {
...
@@ -38,7 +38,7 @@ func initMysqlDB() {
config
.
Config
.
Mysql
.
DBUserName
,
config
.
Config
.
Mysql
.
DBPassword
,
config
.
Config
.
Mysql
.
DBAddress
[
0
],
config
.
Config
.
Mysql
.
DBDatabaseName
)
config
.
Config
.
Mysql
.
DBUserName
,
config
.
Config
.
Mysql
.
DBPassword
,
config
.
Config
.
Mysql
.
DBAddress
[
0
],
config
.
Config
.
Mysql
.
DBDatabaseName
)
db
,
err
=
gorm
.
Open
(
"mysql"
,
dsn
)
db
,
err
=
gorm
.
Open
(
"mysql"
,
dsn
)
if
err
!=
nil
{
if
err
!=
nil
{
panic
(
err
)
panic
(
err
.
Error
()
)
}
}
sqlTable
:=
"CREATE TABLE IF NOT EXISTS `user` ("
+
sqlTable
:=
"CREATE TABLE IF NOT EXISTS `user` ("
+
...
@@ -56,7 +56,7 @@ func initMysqlDB() {
...
@@ -56,7 +56,7 @@ func initMysqlDB() {
" ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;"
" ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;"
err
=
db
.
Exec
(
sqlTable
)
.
Error
err
=
db
.
Exec
(
sqlTable
)
.
Error
if
err
!=
nil
{
if
err
!=
nil
{
panic
(
err
)
panic
(
err
.
Error
()
)
}
}
sqlTable
=
"CREATE TABLE IF NOT EXISTS `friend` ("
+
sqlTable
=
"CREATE TABLE IF NOT EXISTS `friend` ("
+
...
@@ -69,7 +69,7 @@ func initMysqlDB() {
...
@@ -69,7 +69,7 @@ func initMysqlDB() {
" ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;"
" ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;"
err
=
db
.
Exec
(
sqlTable
)
.
Error
err
=
db
.
Exec
(
sqlTable
)
.
Error
if
err
!=
nil
{
if
err
!=
nil
{
panic
(
err
)
panic
(
err
.
Error
()
)
}
}
sqlTable
=
"CREATE TABLE IF NOT EXISTS `friend_request` ("
+
sqlTable
=
"CREATE TABLE IF NOT EXISTS `friend_request` ("
+
...
@@ -82,7 +82,7 @@ func initMysqlDB() {
...
@@ -82,7 +82,7 @@ func initMysqlDB() {
" ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;"
" ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;"
err
=
db
.
Exec
(
sqlTable
)
.
Error
err
=
db
.
Exec
(
sqlTable
)
.
Error
if
err
!=
nil
{
if
err
!=
nil
{
panic
(
err
)
panic
(
err
.
Error
()
)
}
}
sqlTable
=
"CREATE TABLE IF NOT EXISTS `black_list` ("
+
sqlTable
=
"CREATE TABLE IF NOT EXISTS `black_list` ("
+
...
@@ -94,7 +94,7 @@ func initMysqlDB() {
...
@@ -94,7 +94,7 @@ func initMysqlDB() {
" ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;"
" ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;"
err
=
db
.
Exec
(
sqlTable
)
.
Error
err
=
db
.
Exec
(
sqlTable
)
.
Error
if
err
!=
nil
{
if
err
!=
nil
{
panic
(
err
)
panic
(
err
.
Error
()
)
}
}
sqlTable
=
"CREATE TABLE IF NOT EXISTS `user_black_list` ("
+
sqlTable
=
"CREATE TABLE IF NOT EXISTS `user_black_list` ("
+
...
@@ -105,7 +105,7 @@ func initMysqlDB() {
...
@@ -105,7 +105,7 @@ func initMysqlDB() {
" ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;"
" ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;"
err
=
db
.
Exec
(
sqlTable
)
.
Error
err
=
db
.
Exec
(
sqlTable
)
.
Error
if
err
!=
nil
{
if
err
!=
nil
{
panic
(
err
)
panic
(
err
.
Error
()
)
}
}
sqlTable
=
"CREATE TABLE IF NOT EXISTS `group` ("
+
sqlTable
=
"CREATE TABLE IF NOT EXISTS `group` ("
+
...
@@ -120,7 +120,7 @@ func initMysqlDB() {
...
@@ -120,7 +120,7 @@ func initMysqlDB() {
" ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;"
" ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;"
err
=
db
.
Exec
(
sqlTable
)
.
Error
err
=
db
.
Exec
(
sqlTable
)
.
Error
if
err
!=
nil
{
if
err
!=
nil
{
panic
(
err
)
panic
(
err
.
Error
()
)
}
}
sqlTable
=
"CREATE TABLE IF NOT EXISTS `group_member` ("
+
sqlTable
=
"CREATE TABLE IF NOT EXISTS `group_member` ("
+
...
@@ -134,7 +134,7 @@ func initMysqlDB() {
...
@@ -134,7 +134,7 @@ func initMysqlDB() {
" ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;"
" ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;"
err
=
db
.
Exec
(
sqlTable
)
.
Error
err
=
db
.
Exec
(
sqlTable
)
.
Error
if
err
!=
nil
{
if
err
!=
nil
{
panic
(
err
)
panic
(
err
.
Error
()
)
}
}
sqlTable
=
"CREATE TABLE IF NOT EXISTS `group_request` ("
+
sqlTable
=
"CREATE TABLE IF NOT EXISTS `group_request` ("
+
...
@@ -155,7 +155,7 @@ func initMysqlDB() {
...
@@ -155,7 +155,7 @@ func initMysqlDB() {
" ) ENGINE=InnoDB AUTO_INCREMENT=38 DEFAULT CHARSET=utf8mb4;"
" ) ENGINE=InnoDB AUTO_INCREMENT=38 DEFAULT CHARSET=utf8mb4;"
err
=
db
.
Exec
(
sqlTable
)
.
Error
err
=
db
.
Exec
(
sqlTable
)
.
Error
if
err
!=
nil
{
if
err
!=
nil
{
panic
(
err
)
panic
(
err
.
Error
()
)
}
}
sqlTable
=
"CREATE TABLE IF NOT EXISTS `chat_log` ("
+
sqlTable
=
"CREATE TABLE IF NOT EXISTS `chat_log` ("
+
...
@@ -173,7 +173,7 @@ func initMysqlDB() {
...
@@ -173,7 +173,7 @@ func initMysqlDB() {
" ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;"
" ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;"
err
=
db
.
Exec
(
sqlTable
)
.
Error
err
=
db
.
Exec
(
sqlTable
)
.
Error
if
err
!=
nil
{
if
err
!=
nil
{
panic
(
err
)
panic
(
err
.
Error
()
)
}
}
}
}
...
...
pkg/common/kafka/consumer.go
浏览文件 @
72b09864
...
@@ -20,14 +20,14 @@ func NewKafkaConsumer(addr []string, topic string) *Consumer {
...
@@ -20,14 +20,14 @@ func NewKafkaConsumer(addr []string, topic string) *Consumer {
consumer
,
err
:=
sarama
.
NewConsumer
(
p
.
addr
,
nil
)
consumer
,
err
:=
sarama
.
NewConsumer
(
p
.
addr
,
nil
)
if
err
!=
nil
{
if
err
!=
nil
{
panic
(
err
)
panic
(
err
.
Error
()
)
return
nil
return
nil
}
}
p
.
Consumer
=
consumer
p
.
Consumer
=
consumer
partitionList
,
err
:=
consumer
.
Partitions
(
p
.
Topic
)
partitionList
,
err
:=
consumer
.
Partitions
(
p
.
Topic
)
if
err
!=
nil
{
if
err
!=
nil
{
panic
(
err
)
panic
(
err
.
Error
()
)
return
nil
return
nil
}
}
p
.
PartitionList
=
partitionList
p
.
PartitionList
=
partitionList
...
...
pkg/common/kafka/consumer_group.go
浏览文件 @
72b09864
...
@@ -30,11 +30,11 @@ func NewMConsumerGroup(consumerConfig *MConsumerGroupConfig, topics, addr []stri
...
@@ -30,11 +30,11 @@ func NewMConsumerGroup(consumerConfig *MConsumerGroupConfig, topics, addr []stri
config
.
Consumer
.
Return
.
Errors
=
consumerConfig
.
IsReturnErr
config
.
Consumer
.
Return
.
Errors
=
consumerConfig
.
IsReturnErr
client
,
err
:=
sarama
.
NewClient
(
addr
,
config
)
client
,
err
:=
sarama
.
NewClient
(
addr
,
config
)
if
err
!=
nil
{
if
err
!=
nil
{
panic
(
err
)
panic
(
err
.
Error
()
)
}
}
consumerGroup
,
err
:=
sarama
.
NewConsumerGroupFromClient
(
groupID
,
client
)
consumerGroup
,
err
:=
sarama
.
NewConsumerGroupFromClient
(
groupID
,
client
)
if
err
!=
nil
{
if
err
!=
nil
{
panic
(
err
)
panic
(
err
.
Error
()
)
}
}
return
&
MConsumerGroup
{
return
&
MConsumerGroup
{
consumerGroup
,
consumerGroup
,
...
@@ -47,7 +47,7 @@ func (mc *MConsumerGroup) RegisterHandleAndConsumer(handler sarama.ConsumerGroup
...
@@ -47,7 +47,7 @@ func (mc *MConsumerGroup) RegisterHandleAndConsumer(handler sarama.ConsumerGroup
for
{
for
{
err
:=
mc
.
ConsumerGroup
.
Consume
(
ctx
,
mc
.
topics
,
handler
)
err
:=
mc
.
ConsumerGroup
.
Consume
(
ctx
,
mc
.
topics
,
handler
)
if
err
!=
nil
{
if
err
!=
nil
{
panic
(
err
)
panic
(
err
.
Error
()
)
}
}
}
}
}
}
pkg/common/kafka/producer.go
浏览文件 @
72b09864
...
@@ -25,7 +25,7 @@ func NewKafkaProducer(addr []string, topic string) *Producer {
...
@@ -25,7 +25,7 @@ func NewKafkaProducer(addr []string, topic string) *Producer {
producer
,
err
:=
sarama
.
NewSyncProducer
(
p
.
addr
,
p
.
config
)
//Initialize the client
producer
,
err
:=
sarama
.
NewSyncProducer
(
p
.
addr
,
p
.
config
)
//Initialize the client
if
err
!=
nil
{
if
err
!=
nil
{
panic
(
err
)
panic
(
err
.
Error
()
)
return
nil
return
nil
}
}
p
.
producer
=
producer
p
.
producer
=
producer
...
...
pkg/common/log/logrus.go
浏览文件 @
72b09864
...
@@ -34,7 +34,7 @@ func loggerInit(moduleName string) *Logger {
...
@@ -34,7 +34,7 @@ func loggerInit(moduleName string) *Logger {
//Close std console output
//Close std console output
src
,
err
:=
os
.
OpenFile
(
os
.
DevNull
,
os
.
O_APPEND
|
os
.
O_WRONLY
,
os
.
ModeAppend
)
src
,
err
:=
os
.
OpenFile
(
os
.
DevNull
,
os
.
O_APPEND
|
os
.
O_WRONLY
,
os
.
ModeAppend
)
if
err
!=
nil
{
if
err
!=
nil
{
panic
(
err
)
panic
(
err
.
Error
()
)
}
}
writer
:=
bufio
.
NewWriter
(
src
)
writer
:=
bufio
.
NewWriter
(
src
)
logger
.
SetOutput
(
writer
)
logger
.
SetOutput
(
writer
)
...
@@ -82,7 +82,7 @@ func initRotateLogs(rotationTime time.Duration, maxRemainNum uint, level string,
...
@@ -82,7 +82,7 @@ func initRotateLogs(rotationTime time.Duration, maxRemainNum uint, level string,
rotatelogs
.
WithRotationCount
(
maxRemainNum
),
rotatelogs
.
WithRotationCount
(
maxRemainNum
),
)
)
if
err
!=
nil
{
if
err
!=
nil
{
panic
(
err
)
panic
(
err
.
Error
()
)
}
else
{
}
else
{
return
writer
return
writer
}
}
...
...
pkg/utils/get_server_ip.go
浏览文件 @
72b09864
...
@@ -17,7 +17,7 @@ func init() {
...
@@ -17,7 +17,7 @@ func init() {
// see https://gist.github.com/jniltinho/9787946#gistcomment-3019898
// see https://gist.github.com/jniltinho/9787946#gistcomment-3019898
conn
,
err
:=
net
.
Dial
(
"udp"
,
"8.8.8.8:80"
)
conn
,
err
:=
net
.
Dial
(
"udp"
,
"8.8.8.8:80"
)
if
err
!=
nil
{
if
err
!=
nil
{
panic
(
err
)
panic
(
err
.
Error
()
)
}
}
defer
conn
.
Close
()
defer
conn
.
Close
()
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录