liubin/ContextOS
1
0
Fork 0
forked from x/ContextOS
Code Pull Requests Activity

mac mod message.ccc 将模块的操作移动到消息上

Browse Source
This commit is contained in:
shaoying 2017-11-13 08:46:04 +08:00
parent 2b8bdd92c3
commit 1ddb903a87
2 changed files with 28 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/context/mdb/mdb.go
View File

@ -27,32 +27,32 @@ func (mdb *MDB) Begin(m *ctx.Message, arg ...string) ctx.Server { // {{{
// }}} // }}}
func (mdb *MDB) Start(m *ctx.Message, arg ...string) bool { // {{{ func (mdb *MDB) Start(m *ctx.Message, arg ...string) bool { // {{{
mdb.Capi("nsource", 1) m.Capi("nsource", 1)
defer mdb.Capi("nsource", -1) defer m.Capi("nsource", -1)
if len(arg) > 0 { if len(arg) > 0 {
mdb.Conf("source", arg[0]) m.Conf("source", arg[0])
if len(arg) > 1 { if len(arg) > 1 {
mdb.Conf("driver", arg[1]) m.Conf("driver", arg[1])
} }
} }
if mdb.Conf("source") == "" || mdb.Conf("driver") == "" { if m.Conf("source") == "" || m.Conf("driver") == "" {
return true return true
} }
db, e := sql.Open(mdb.Conf("driver"), mdb.Conf("source")) db, e := sql.Open(m.Conf("driver"), m.Conf("source"))
mdb.Assert(e) m.Assert(e)
mdb.db = db mdb.db = db
defer mdb.db.Close() defer mdb.db.Close()
log.Println(mdb.Name, "open:", mdb.Conf("driver"), mdb.Conf("source")) log.Println(mdb.Name, "open:", m.Conf("driver"), m.Conf("source"))
defer log.Println(mdb.Name, "close:", mdb.Conf("driver"), mdb.Conf("source")) defer log.Println(mdb.Name, "close:", m.Conf("driver"), m.Conf("source"))
for _, p := range m.Meta["prepare"] { for _, p := range m.Meta["prepare"] {
_, e := db.Exec(p) _, e := db.Exec(p)
mdb.Assert(e) m.Assert(e)
} }
return true return true
@ -86,7 +86,7 @@ var Index = &ctx.Context{Name: "mdb", Help: "内存数据库",
"prepare": "打开数据库时自动执行的语句", "prepare": "打开数据库时自动执行的语句",
}, },
Hand: func(c *ctx.Context, m *ctx.Message, key string, arg ...string) string { Hand: func(c *ctx.Context, m *ctx.Message, key string, arg ...string) string {
m.Start("db"+c.Cap("nsource"), arg...) // {{{ m.Start("db"+m.Cap("nsource"), arg...) // {{{
return "" return ""
// }}} // }}}
}}, }},

33
src/context/tcp/tcp.go
View File

@ -20,25 +20,25 @@ func (tcp *TCP) Begin(m *ctx.Message, arg ...string) ctx.Server { // {{{
// }}} // }}}
func (tcp *TCP) Start(m *ctx.Message, arg ...string) bool { // {{{ func (tcp *TCP) Start(m *ctx.Message, arg ...string) bool { // {{{
if tcp.Conf("address") == "" { if m.Conf("address") == "" {
return true return true
} }
l, e := net.Listen("tcp4", tcp.Conf("address")) l, e := net.Listen("tcp4", m.Conf("address"))
tcp.Assert(e) m.Assert(e)
tcp.listener = l tcp.listener = l
log.Printf("%s listen(%d): %v", tcp.Name, tcp.Capi("nlisten", 1), l.Addr()) log.Printf("%s listen(%d): %v", tcp.Name, m.Capi("nlisten", 1), l.Addr())
defer tcp.Capi("nlisten", -1) defer m.Capi("nlisten", -1)
defer log.Println("%s close(%d): %v", tcp.Name, tcp.Capi("nlisten", 0), l.Addr()) defer log.Println("%s close(%d): %v", tcp.Name, m.Capi("nlisten", 0), l.Addr())
for { for {
c, e := l.Accept() c, e := l.Accept()
tcp.Assert(e) m.Assert(e)
log.Printf("%s accept(%d): %v<-%v", tcp.Name, tcp.Capi("nclient", 1), c.LocalAddr(), c.RemoteAddr()) log.Printf("%s accept(%d): %v<-%v", tcp.Name, m.Capi("nclient", 1), c.LocalAddr(), c.RemoteAddr())
// defer log.Println(tcp.Name, "close:", tcp.Capi("nclient", -1), c.LocalAddr(), "<-", c.RemoteAddr()) // defer log.Println(tcp.Name, "close:", m.Capi("nclient", -1), c.LocalAddr(), "<-", c.RemoteAddr())
msg := m.Spawn(m.Context, c.RemoteAddr().String()).Put("option", "io", c) msg := m.Spawn(m.Source, c.RemoteAddr().String()).Put("option", "io", c)
msg.Cmd("open", c.RemoteAddr().String(), "tcp") msg.Cmd("open", c.RemoteAddr().String(), "tcp")
} }
@ -67,7 +67,7 @@ func (tcp *TCP) Exit(m *ctx.Message, arg ...string) bool { // {{{
return true return true
} }
if c, ok := m.Data["detail"].(net.Conn); ok && m.Context == tcp.Context { if c, ok := m.Data["detail"].(net.Conn); ok && m.Source == tcp.Context {
c.Close() c.Close()
delete(m.Data, "detail") delete(m.Data, "detail")
return true return true
@ -88,9 +88,10 @@ var Index = &ctx.Context{Name: "tcp", Help: "网络连接",
"listen": &ctx.Command{Name: "listen address", Help: "监听连接", Hand: func(c *ctx.Context, m *ctx.Message, key string, arg ...string) string { "listen": &ctx.Command{Name: "listen address", Help: "监听连接", Hand: func(c *ctx.Context, m *ctx.Message, key string, arg ...string) string {
switch len(arg) { // {{{ switch len(arg) { // {{{
case 0: case 0:
for k, s := range m.Target.Contexts { m.Target.Travel(func(c *ctx.Context) bool {
m.Echo("%s %s\n", k, s.Server.(*TCP).listener.Addr().String()) m.Echo("%s %s\n", c.Name, c.Server.(*TCP).listener.Addr().String())
} return true
})
case 1: case 1:
go m.Start(arg[0], arg[0]) go m.Start(arg[0], arg[0])
} }
@ -107,7 +108,7 @@ var Index = &ctx.Context{Name: "tcp", Help: "网络连接",
} }
case 2: case 2:
conn, e := net.Dial("tcp", arg[0]) conn, e := net.Dial("tcp", arg[0])
c.Assert(e) m.Assert(e)
log.Println(tcp.Name, "dial:", conn.LocalAddr(), "->", conn.RemoteAddr()) log.Println(tcp.Name, "dial:", conn.LocalAddr(), "->", conn.RemoteAddr())
} }
return "" return ""
@ -116,7 +117,7 @@ var Index = &ctx.Context{Name: "tcp", Help: "网络连接",
"exit": &ctx.Command{Name: "exit", Help: "退出", Hand: func(c *ctx.Context, m *ctx.Message, key string, arg ...string) string { "exit": &ctx.Command{Name: "exit", Help: "退出", Hand: func(c *ctx.Context, m *ctx.Message, key string, arg ...string) string {
tcp, ok := m.Target.Server.(*TCP) // {{{ tcp, ok := m.Target.Server.(*TCP) // {{{
if !ok { if !ok {
tcp, ok = m.Context.Server.(*TCP) tcp, ok = m.Source.Server.(*TCP)
} }
if ok { if ok {
tcp.Context.Exit(m) tcp.Context.Exit(m)