Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop #7

Merged
merged 8 commits into from
Dec 10, 2015
Merged

Develop #7

merged 8 commits into from
Dec 10, 2015

Conversation

waterdrinker
Copy link
Contributor

1 Add maria/worker.
2 Fix command line interface: 1. -w sync(or async) 2. xxx.xxx:app
3 Add maria/tests

@CMGS
Copy link
Owner

CMGS commented Aug 15, 2014

= =首先。。。请先rebase。。。。
@xtao 来review吧- -

@waterdrinker
Copy link
Contributor Author

好的 我rebase一下

@xtao
Copy link
Contributor

xtao commented Aug 15, 2014

👍

logging.BASIC_FORMAT = "%(asctime)s [%(name)s] %(message)s"
logging.basicConfig(level=level)
if self.config.log_file:
paramiko.util.log_to_file(self.config.log_file, level=level)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

paramiko 的 log 能否都统一输出到 logging ,然后输出文件与否由 logging 的配置决定? cc @CMGS

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

可以的,直接上报到logging.root

@xtao
Copy link
Contributor

xtao commented Aug 16, 2014

maria -w maria.worker.socket.SocketServer -b 127.0.0.1:2200 maria.gssh:GSSHServer
实际情况,我期望的可能是这样的参数:
maria -w sync -b 127.0.0.1:2200 xx.xx:app
sync 是 worker 类似那个,另外一个参数是 async
app 是一个已经初始化过的 GSSHServer 实例

@xtao
Copy link
Contributor

xtao commented Aug 27, 2014

@waterdrinker gevent 的 worker 正常了么?

@xtao
Copy link
Contributor

xtao commented Aug 27, 2014

@waterdrinker 改一下 pull request 的 title 吧,比如 'Add maria command' 什么的

# -*- coding: utf-8 -

try:
import gevent
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

gevent 并没有用到。。

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

默认-w sync不用gevent, 指定-w async才会导入这个模块

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

我是说 gevent 这个module 在这个文件里面并没有用到

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

知道了,我改一下

@alexband
Copy link

@xtao 这位也是参加OSC暑假的实习生吗?

@xtao
Copy link
Contributor

xtao commented Aug 27, 2014

@alexband 是的

@waterdrinker
Copy link
Contributor Author

@xtao Add maria/tests

@xtao
Copy link
Contributor

xtao commented Sep 8, 2014

👍

assert pclone.wait() == 0

def test_push(self):
cmd = 'mkdir %s; \
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这里有点狠了。。写个 bash 做这件事?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tonicmuroq
Copy link

... 这个 PR 被遗忘了么

@xtao
Copy link
Contributor

xtao commented Mar 29, 2015

去年的。。。

@tonicmuroq
Copy link

... 我今年又看到了这个...

@xtao
Copy link
Contributor

xtao commented Jul 13, 2015

@tonicbupt 前年的

CMGS added a commit that referenced this pull request Dec 10, 2015
@CMGS CMGS merged commit c228e9e into CMGS:develop Dec 10, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants